Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Sat, 28 Apr 2012 21:04:04 +0000 (23:04 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Sat, 28 Apr 2012 21:04:04 +0000 (23:04 +0200)
commit301483a22e8c84ed1cc19c77c96547be735d2b00
treea67011f12d9d62b4800b6a96b420677a6d859bcc
parent1f94a224b746c3ab486dab44db7d265a6a0ef9be
parent14a6209eb1c7fb71d865e62f23a99a47b1f3d9d2
Merge branch 'work'