Merge branch 'master' into dev
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 6 Nov 2012 19:53:09 +0000 (14:53 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 6 Nov 2012 19:53:09 +0000 (14:53 -0500)
commitf00596347bae6a3d41ca5b50c6add6d29b914afa
tree847975028a9703032456bc826f6d59af4d070d5a
parent26b53326465c78009e318513db4f2d2b89749c1c
parent9cea4949e5b65b3a556fc9f29c83efea3b0af9e4
Merge branch 'master' into dev