Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Tue, 19 Jun 2012 22:00:07 +0000 (00:00 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Tue, 19 Jun 2012 22:00:07 +0000 (00:00 +0200)
commita534af37617d3d5bdbfd15bdf5b0ed2cd1b0316f
tree29d62efb0fbd76dd5e2cb4f56536df4d9b78bb61
parent6893e532c8709cab15542b09dfaf05f80105fca6
parenteb90ab95d203acdb5384bd82af40fc3c6b0a7b51
Merge branch 'work'