Merge branch 'develop' into notes
authorPaul Brossier <piem@piem.org>
Wed, 12 Aug 2015 17:21:38 +0000 (19:21 +0200)
committerPaul Brossier <piem@piem.org>
Wed, 12 Aug 2015 17:21:38 +0000 (19:21 +0200)

Trivial merge