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)
commit02d111b1b53ef01fc6e9ab6c4bc60b8af1be0067
tree8356f4a019969ee99a45e264c87d38555cf316cc
parent7a2e1f05adad990a6b161865267abf07ffec7a7e
parent7699a55aed3a9a7daeb4c6a5a9a280f43edf455f
Merge branch 'branch-1.2' into debian
debian/rules