Merge branch 'thomie-normalise'
authorNeil Mitchell <ndmitchell@gmail.com>
Sun, 26 Oct 2014 21:41:24 +0000 (21:41 +0000)
committerNeil Mitchell <ndmitchell@gmail.com>
Sun, 26 Oct 2014 21:41:24 +0000 (21:41 +0000)

Trivial merge