Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Tue, 10 Jul 2012 18:39:29 +0000 (20:39 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Tue, 10 Jul 2012 18:39:29 +0000 (20:39 +0200)
commit3b410683904550356c987d7cc6ee6ef550501fa1
tree92c98e6debf55e65f0b82610052716fecfc3e64b
parentf6658c151688647155e32f05ca6e0ae3275c22b6
parentba306c2b01076accac7f72d81510dfbc1da728ab
Merge branch 'work'