Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Fri, 20 Jul 2012 13:46:56 +0000 (15:46 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Fri, 20 Jul 2012 13:46:56 +0000 (15:46 +0200)
commit524386f4c27ba04c67d3c298368ba104e8cfefc4
treee1e3c1a9721642ab366a31515ec8d32cf7a51f18
parentc85454131ed8ab2b0a63595aa638884e88b62638
parentf1c6b6200cd9b012d5569cf9b6fdacd2957ab4e5
Merge branch 'work'