Merge branch 'work'
authorAlexis <alexis.bory@gmail.com>
Mon, 1 Oct 2012 17:02:02 +0000 (19:02 +0200)
committerAlexis <alexis.bory@gmail.com>
Mon, 1 Oct 2012 17:02:02 +0000 (19:02 +0200)
commit66d9bdf84e1727d52a2e5b298e3de1c812c20a28
tree72b6f1fa5d769b5f7f3516d5c52f31344a0ad883
parenta5188dbf15d2519f5d9be09e9e5f25a7ee9ae22b
parent5ce3e1c9296ff6a10087290d94b2e52c2144a61c
Merge branch 'work'