Merge branch 'upstream'
authorBdale Garbee <bdale@gag.com>
Wed, 10 Oct 2012 13:03:02 +0000 (07:03 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Oct 2012 13:03:02 +0000 (07:03 -0600)
commit389213bc0d9e6b16780f413b883e8b442b83b041
treeb6e2add7ef90999ead704ddcfa5c3293ce6ec1d9
parent5ca77188f961aea4b95123227bd6952b735b80e7
parent1f159338ae285680863150605167fea32aa74aca
Merge branch 'upstream'

Conflicts:
README
ver.h
debian/changelog
debian/copyright