Merge branch 'master' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 13 Jul 2011 13:36:24 +0000 (09:36 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 13 Jul 2011 13:36:24 +0000 (09:36 -0400)
commitb7f3d04c356caed3b6141d8b0966954ec65fa4b9
treebf8b1c13983925036596ae95f512f9b2987f4bc5
parent387ab827a3c3d1b9ba3ad00e98bb3a6415b3513b
parent3a62d4fef3cce89761d87be84fa094364ffb28fe
Merge branch 'master' into dev