Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Sun, 1 Jul 2012 21:23:59 +0000 (23:23 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Sun, 1 Jul 2012 21:23:59 +0000 (23:23 +0200)
commit2e32882e4dad9a07922eefd786a69b82d2a33433
tree2bc012c86a6bcfe84159a5953a3d41c3237d6661
parente96fc86ea10e0ed9223e9f6150cc7c8a44be784c
parent2d066c2f83f3f1aa92db82dbf19465b4f5a3097f
Merge branch 'work'