Merge remote-tracking branch 'tianon/master'
authorsrs5694 <srs5694@users.sourceforge.net>
Thu, 3 Dec 2015 01:34:06 +0000 (20:34 -0500)
committersrs5694 <srs5694@users.sourceforge.net>
Thu, 3 Dec 2015 01:34:06 +0000 (20:34 -0500)
commit6f26706bb54004d3b435c51f44fa17e996d82c68
tree2a8bd821894e264836a20f620410c284ecc6e60f
parent47a506147f328503572286390f6cac5c8537d5df
parentbf5ec98d49c81b0858d9fcb48fea0592602444fe
Merge remote-tracking branch 'tianon/master'

Conflicts:
debian/control
debian/copyright
debian/copyright