Merge branch 'branch-1.2' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 21 May 2013 15:30:43 +0000 (09:30 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 21 May 2013 15:30:43 +0000 (09:30 -0600)

Trivial merge