Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Tue, 15 Oct 2013 16:31:29 +0000 (10:31 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 15 Oct 2013 16:31:29 +0000 (10:31 -0600)
commita73a1e465041482541c1e718e876e75b5487e28f
tree7f1bcaeadd1d18edb61767c698dc656909dc4ca1
parentc2309b4a87f34290db3fd44f8aace06dc54f5ef2
parent95be0027172d529353674a14fa0607c6c56a1436
Merge branch 'doc-orig' into doc-debian