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)
commit1ecb53a60573127a4cc976980053adda3bb5e089
tree75b42506a5125abf40f8a0db916cd8b9814a53e6
parent0240b648949d78c71d8da6ce5ba019a57f974dee
parent407cbc9c1736ff161309112289876e0d8218c214
Merge remote-tracking branch 'tianon/master'

Conflicts:
debian/changelog
debian/control
debian/copyright
debian/rules