Merge branch 'branch-1.2' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 21 May 2013 18:52:26 +0000 (12:52 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 21 May 2013 18:52:26 +0000 (12:52 -0600)
commit1478f05f6a4bdbab7a89005b2f76af9aaa41b3f7
tree4e91d7974b83e284dfefb4299c5cb52f50e10577
parentda2ea5232ae3ce287675a549b3155821f56c2c40
parent0c2d248b9992a013c630fbd6e3cd8450ffa49fd2
Merge branch 'branch-1.2' into debian