Merge branch 'work'
authorAlexis Bory <alexis.bory@gmail.com>
Thu, 12 Jul 2012 16:24:26 +0000 (18:24 +0200)
committerAlexis Bory <alexis.bory@gmail.com>
Thu, 12 Jul 2012 16:24:26 +0000 (18:24 +0200)
commit05bd663d9746775b8e29525e324bcd7b03b4cf0c
tree0933a709a8ecce3e8b23bf4777708ccbb7893048
parent8a4df991806d36143d49e4521c75c180718d2356
parentcd5f601633dd8f6153dc89b6233610dfad4aa7df
Merge branch 'work'