Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Tue, 17 May 2016 20:13:31 +0000 (14:13 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 17 May 2016 20:13:31 +0000 (14:13 -0600)
commit2f0628eea0d6b08423724828b55369ba784e7e5c
treef185e614c976a3d24b1ac330fb410d42fc2f08ed
parentb130d54daba77d9137d15b818f3c62198cb149b9
parent2786790d4828f036e8f9d88a4493f6a238e48f37
Merge branch 'doc-orig' into doc-debian