Merge branch 'master' into thumb
authorDennis Groenen <tj.groenen@gmail.com>
Thu, 25 Oct 2012 19:10:55 +0000 (21:10 +0200)
committerDennis Groenen <tj.groenen@gmail.com>
Thu, 25 Oct 2012 19:10:55 +0000 (21:10 +0200)
commitd3e826977442a13f8eb1744f01b76ef5a4592f14
tree4c3b8e53b216fca2553a45c080c38cdf262396ba
parent23fa1a75f430893e986f96c58b686cb027d40fb5
parent586aa99badb8371277c5e64863b68afd24f2ff88
Merge branch 'master' into thumb

Conflicts:
debian/changelog
debian/changelog
debian/config/config.busybox
debian/rules