Merge branch 'master' into work
authoralexis <alexis.bory@gmail.com>
Thu, 18 Oct 2012 20:01:40 +0000 (22:01 +0200)
committeralexis <alexis.bory@gmail.com>
Thu, 18 Oct 2012 20:01:40 +0000 (22:01 +0200)
commit0b09c30cd37c1ebc42f53b786eaecf12fbed2625
treea2580c4cf80c57ca5e88d5c191d97132e790603e
parent8d86b53abef8b75fd08135e70d5b593707fd31db
parent4b8efceff35b0fde04986882ede18235d93d3134
Merge branch 'master' into work