Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Sat, 9 Jun 2012 19:38:27 +0000 (21:38 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Sat, 9 Jun 2012 19:38:27 +0000 (21:38 +0200)
commit04c49c688560689f82f1e553bf810cd23ba554ea
tree12a39658227938c999963ef5270fa4d958852dcd
parentef67e539fb70410005bdb161ebeaa73288b95ac9
parent67545369230606f4b52c27e368cdf781919fa555
Merge branch 'work'