Merge branch 'branch-1.5' into debian
authorBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 06:03:58 +0000 (00:03 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 06:03:58 +0000 (00:03 -0600)
commitbfc0f22e706b973981e850e42a5b242dd65dbc67
treedd32a98661a71e718cadd67f6a6ee0d415c154da
parent33e1837857a6b0fe19c540aab9bfacbd8b077c0a
parent5de00e9e39cff2d3b409c2ce99caa994f0a36202
Merge branch 'branch-1.5' into debian