Merge remote-tracking branch 'tianon/master'
authorsrs5694 <srs5694@users.sourceforge.net>
Sun, 29 Nov 2015 19:01:13 +0000 (14:01 -0500)
committersrs5694 <srs5694@users.sourceforge.net>
Sun, 29 Nov 2015 19:01:13 +0000 (14:01 -0500)
Conflicts:
debian/changelog
debian/control
debian/copyright
debian/rules


Trivial merge