Merge branch 'work'
authorAlexis <alexis.bory@gmail.com>
Thu, 6 Sep 2012 11:39:52 +0000 (13:39 +0200)
committerAlexis <alexis.bory@gmail.com>
Thu, 6 Sep 2012 11:39:52 +0000 (13:39 +0200)
commite216747f3e1484fa02ba7e6903e91b6222d14820
tree16f89c576246ace00aa35184fc2b1eebb771550c
parent62bd5e332535f76fdb2157d51cf683c6fbbce4fe
parent39a9d5ddd1fe6f23ebe280efbfc6424f9c185173
Merge branch 'work'