Merge branch 'work'
authorAlexis <alexis.bory@gmail.com>
Thu, 6 Sep 2012 15:23:46 +0000 (17:23 +0200)
committerAlexis <alexis.bory@gmail.com>
Thu, 6 Sep 2012 15:23:46 +0000 (17:23 +0200)
commit6b4b81dd0c485479e16dea73bb6980b28c10e60e
tree2768a906ef676e1ef87fc774fddf270a5495730a
parenteccfbc3ab2c50e20c86f935e5340e8e2b09ca068
parent9886dcd10a3bc8c2d8ccc62a9da4c377e05c12ca
Merge branch 'work'