Merge branch 'dev' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 20 Feb 2012 20:05:48 +0000 (15:05 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 20 Feb 2012 20:05:48 +0000 (15:05 -0500)
commite330b9a1b27db7ee9e4197607fc6dc7aa8c87431
tree505139e67a145cd132240d454e7cae6cc25a98d8
parenta4329faed0c46dfe3db736641237b481ff8dd4a9
parent84242765c158997919f30411d9ec9ca6a9aa230f
Merge branch 'dev' into test