Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Tue, 3 Jul 2012 19:50:37 +0000 (21:50 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Tue, 3 Jul 2012 19:50:37 +0000 (21:50 +0200)
commit8424f20cb28f89082fee512efa460060391e8bbe
treeca29308e1be739d0ae9239caba94320a39eae351
parent2049be625277bbe13798bf33c7cc7436348935af
parent4a0a8ab03d382dceb06bf3536be257ba0de85150
Merge branch 'work'