Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Sat, 7 Jul 2012 13:47:16 +0000 (15:47 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Sat, 7 Jul 2012 13:47:16 +0000 (15:47 +0200)
commitf20d22fb5c9f5fcf304e46f0fd2caa5850ada796
tree528608bffba2ccbd02fa02540948bc82cf6601e8
parent948063c01753241c78d2accf93dd92c8867336de
parent29402660cfb7d1a247e15f3d759bf402256fdf31
Merge branch 'work'