Merge branch 'work'
authoralexis <alexis.bory@gmail.com>
Sun, 25 Nov 2012 18:42:36 +0000 (19:42 +0100)
committeralexis <alexis.bory@gmail.com>
Sun, 25 Nov 2012 18:42:36 +0000 (19:42 +0100)
commit41ad90ca9f0f4cc7eaeb1aa88fbef94753a75652
treef81fd12a4d7779846f1bc1c68f051b6546e90df0
parent60b8aecd44bdc1017ee17a61bd5ef24dce98a698
parentab9d3d691baa61bd9478ca3e729a60eaa93bfea6
Merge branch 'work'