Merge branch 'branch-1.2' into debian
authorBdale Garbee <bdale@gag.com>
Sat, 17 Aug 2013 14:04:36 +0000 (16:04 +0200)
committerBdale Garbee <bdale@gag.com>
Sat, 17 Aug 2013 14:04:36 +0000 (16:04 +0200)

Trivial merge