Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Tue, 4 Feb 2014 01:48:38 +0000 (18:48 -0700)
committerBdale Garbee <bdale@gag.com>
Tue, 4 Feb 2014 01:48:38 +0000 (18:48 -0700)
commite03b0a9e6e434598736e059dc04d7aca6b14792b
treec46f5213c3da76f3d6834367deca9e0381ff434c
parentbf0e8c18635ff5a0274d49fdebc0717d6dde6434
parent3e4016c9d778cbc977c4ccf75fb499a95ee235b7
Merge branch 'doc-orig' into doc-debian