Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Thu, 12 Jul 2012 16:22:16 +0000 (18:22 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Thu, 12 Jul 2012 16:22:16 +0000 (18:22 +0200)
commit8a4df991806d36143d49e4521c75c180718d2356
tree079c55a22e0b706a4a519841ee67791ec94e4fbc
parentb6b113fa5c45affe68cfdd074b17b26d67b911b2
parentb044f5e82d9c433112b9278da8a9a8921f0a2360
Merge branch 'work'