Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Tue, 2 Nov 2010 00:09:49 +0000 (18:09 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 2 Nov 2010 00:09:49 +0000 (18:09 -0600)
commit1f55046ef9dbbdda7bb1983cb25e63d5378d45c9
tree68e5fb4fbfe2cca051a70a9f01b33ce857484116
parent51f9920eb907be67da5a128b23af2ff28c1c964e
parent39f3a4e810ddfe3f3385e1201e0e9ce8cb5c233c
Merge branch 'doc-orig' into doc-debian