Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Mon, 23 Jul 2012 21:03:44 +0000 (23:03 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Mon, 23 Jul 2012 21:03:44 +0000 (23:03 +0200)
commit07ec561e2718e51b037b736d28b9e7344548e2ac
tree33dadcdee0f280add1d084fd5586a66036e3fabc
parentfd2cde442c9248fe216fd5cfb6d7817f9b939fb2
parentc4a14892d809bf0f2859f319b405a8e76f5fcab2
Merge branch 'work'