Merge branch 'branch-1.2' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 16 May 2013 06:36:23 +0000 (00:36 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 16 May 2013 06:36:23 +0000 (00:36 -0600)
1  2 
debian/rules

diff --cc debian/rules
Simple merge