Merge branch 'work'
authoralexis <alexis.bory@gmail.com>
Sun, 11 Nov 2012 16:54:27 +0000 (17:54 +0100)
committeralexis <alexis.bory@gmail.com>
Sun, 11 Nov 2012 16:54:27 +0000 (17:54 +0100)
commit8c13f8f0680249223c0a03911168340bb987a205
tree8bd2e463122e1b3c92e55788a69d6578aa687273
parent4e3a7bd206b6df32c6cc14d4b266dbfdc751e9ab
parent89a7bfb5e547229bce2c99305883428610534904
Merge branch 'work'