Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Sat, 14 Jul 2012 23:01:54 +0000 (01:01 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Sat, 14 Jul 2012 23:01:54 +0000 (01:01 +0200)
commit279c5ddee5dd9edb6f5e63b477372816fe82d5a3
treee2525c27d03749289082bbdf738ba9d64f1462b4
parentc89e6d5b30e0284f47c6d1911cc6cfb59f94c1d1
parentc5d09f6b493b421fbe92b8d6282630f936ac475e
Merge branch 'work'