Merge branch 'dev' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 25 May 2011 16:59:54 +0000 (12:59 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 25 May 2011 16:59:54 +0000 (12:59 -0400)
commit70f0e9a421f737c83b6a37fde64a10cfba98ecaa
treea6cd8e4f41d3d4761f84435aef04f43ada5d7c89
parentadf8ffc1a3360656e6d5bb2f2824a6241459e968
parentd854db080ef0a249df69275f464b09a9e701b4a3
Merge branch 'dev' into test