Merge branch 'work'
authoralexis <alexis.bory@gmail.com>
Thu, 8 Nov 2012 11:08:57 +0000 (12:08 +0100)
committeralexis <alexis.bory@gmail.com>
Thu, 8 Nov 2012 11:08:57 +0000 (12:08 +0100)
commitc04b41f4000717c9eae94d88c146179dc44faed8
treed08943673535a18bd7a0e2aaca6fd7cde42217dc
parentec4d922ef32e1f004d472dfcf4f3a13a2dfc6141
parent9f324a4fbb1ca82ef760fde83094eace334563e2
Merge branch 'work'