Merge branch 'pr/761'
authorDaniel Mack <daniel@zonque.org>
Wed, 29 Jul 2015 18:31:02 +0000 (20:31 +0200)
committerDaniel Mack <daniel@zonque.org>
Wed, 29 Jul 2015 18:31:02 +0000 (20:31 +0200)

Trivial merge