Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Sun, 23 Aug 2015 18:41:10 +0000 (20:41 +0200)
committerBdale Garbee <bdale@gag.com>
Sun, 23 Aug 2015 18:41:10 +0000 (20:41 +0200)

Trivial merge