Merge branch 'dev'
authorLéo Flaventin Hauchecorne <hl037.prog@gmail.com>
Wed, 12 Jun 2013 13:36:26 +0000 (15:36 +0200)
committerLéo Flaventin Hauchecorne <hl037.prog@gmail.com>
Wed, 12 Jun 2013 13:36:26 +0000 (15:36 +0200)
commit4251f97f5e60dcf24a1f302c3d3002c7d8e15c64
tree5a55e5993961d9909d989a421235809508e76cd4
parent153cbc3b491337a3dde99079868376113fef1338
parent7ec939b380cab81d6d524f8174c91eb61dcea164
Merge branch 'dev'