Merge branch 'branch-1.5' into debian
authorBdale Garbee <bdale@gag.com>
Sat, 13 Sep 2014 17:31:35 +0000 (11:31 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 13 Sep 2014 17:31:35 +0000 (11:31 -0600)

Trivial merge