Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Sun, 8 Jul 2012 21:59:07 +0000 (23:59 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Sun, 8 Jul 2012 21:59:07 +0000 (23:59 +0200)
commit05b7ba8af87256eecc2e2925f6088f76abbaa24c
treea6c54e60ebf986c5fc50bc52227ccc243ab17c1b
parent56f92f2d86ad1b7d9f05ac04ce4164e57f650e4b
parent8efdf107949f4716d71666507cf33ca297ac54d8
Merge branch 'work'