Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Thu, 11 Nov 2010 04:07:58 +0000 (21:07 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 11 Nov 2010 04:07:58 +0000 (21:07 -0700)
commit8ace0bd70015270f0a19e8fe2676695b9ac4b2be
tree6be5b9136877121b6f03543cf5272b29713d7a48
parent7700dd2578141f78122985cf3e087f00c382de19
parent3131c6851f845d6481b366194d6648b392055f60
Merge branch 'doc-orig' into doc-debian