This closes #841
authorMartyn Taylor <mtaylor@redhat.com>
Fri, 14 Oct 2016 09:24:13 +0000 (10:24 +0100)
committerMartyn Taylor <mtaylor@redhat.com>
Fri, 14 Oct 2016 09:24:13 +0000 (10:24 +0100)

Trivial merge