Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Sat, 7 Jul 2012 17:23:48 +0000 (19:23 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Sat, 7 Jul 2012 17:23:48 +0000 (19:23 +0200)
commitb426a74819d90005d0a6b23ac0cc5101367ae8f1
tree27526ababa358f00e7bcf07b5b9b9275c6c42810
parent3a0ee98b88951164ce355b825ead57a20853489f
parente860d5bf474bc34364fb59bf3994eb5b776b572a
Merge branch 'work'