From: srs5694 <srs5694@users.sourceforge.net>
Date: Sun, 29 Nov 2015 19:01:13 +0000 (-0500)
Subject: Merge remote-tracking branch 'tianon/master'
X-Git-Url: https://code.delx.au/refind/commitdiff_plain/1ecb53a60573127a4cc976980053adda3bb5e089?hp=-c

Merge remote-tracking branch 'tianon/master'

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

1ecb53a60573127a4cc976980053adda3bb5e089