Merge branch 'branch-1.5' into debian
authorBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 06:05:33 +0000 (00:05 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 06:05:33 +0000 (00:05 -0600)
commit4d0604fb0b3c1cfd43f6815d4549ae8d5d74039b
tree5590a5aab10f444a7df3b55aa2d7f19f80ebc2f5
parentbfc0f22e706b973981e850e42a5b242dd65dbc67
parentacb279125c0fa377c8b1dbbb8634fba60f7f845b
Merge branch 'branch-1.5' into debian