Merge branch 'branch-1.3' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 23 Jan 2014 03:55:41 +0000 (20:55 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 23 Jan 2014 03:55:41 +0000 (20:55 -0700)

Trivial merge