Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Mon, 18 Jun 2012 21:30:18 +0000 (23:30 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Mon, 18 Jun 2012 21:30:18 +0000 (23:30 +0200)
commitf75610f2a785e4d6e1ec02c2881d0b5832b9f66c
treefb17835d03b89fc5581dc5e2da60987a5bd6c91a
parentab4f5459b6cc9474154c2a4665a89e3e50007943
parentaecb3f8f46468ff0d2feec10a990eb4047ad8fed
Merge branch 'work'