Merge pull request #1276 from oneru/for-15.05
authorSteven Barth <steven@midlink.org>
Thu, 21 May 2015 12:44:23 +0000 (14:44 +0200)
committerSteven Barth <steven@midlink.org>
Thu, 21 May 2015 12:44:23 +0000 (14:44 +0200)
[for-15.05] libqrencode: import from old packages


Trivial merge