Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Wed, 10 Mar 2010 17:06:43 +0000 (10:06 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Mar 2010 17:06:43 +0000 (10:06 -0700)
commit6735506bafbd857cd4620a1a3eaed6a6c6c2940f
tree6ac4004d76c5a74d5086009f58032b288e1222ed
parent6e488fc45fbdfd4cc25e4226d5d74bf171458b82
parent10b77aeb9fd3f121f815e25957cdc27acb309811
Merge branch 'doc-orig' into doc-debian