Merge branch 'branch-1.2' into debian
authorBdale Garbee <bdale@gag.com>
Sat, 17 Aug 2013 14:04:36 +0000 (16:04 +0200)
committerBdale Garbee <bdale@gag.com>
Sat, 17 Aug 2013 14:04:36 +0000 (16:04 +0200)
commitc2dc65bca190afaee2bea7eefc3ce2f77cf85945
tree287564c58eae03f7e9c7e034a47867bf70ee36a1
parent17a9b810204d9d268520984e56acfcb6796ab6e0
parenteaabbee19837970022ccb0a8ca1277621cbe0be6
Merge branch 'branch-1.2' into debian