Merge branch 'branch-1.3' into debian
authorBdale Garbee <bdale@gag.com>
Fri, 14 Feb 2014 04:54:46 +0000 (21:54 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 14 Feb 2014 04:54:46 +0000 (21:54 -0700)

Trivial merge