Merge branch 'branch-1.4' into debian
authorBdale Garbee <bdale@gag.com>
Wed, 25 Jun 2014 03:56:25 +0000 (21:56 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 25 Jun 2014 03:56:25 +0000 (21:56 -0600)
1  2 
debian/rules

diff --cc debian/rules
Simple merge