Merge branch 'master' into thumb
authorDennis Groenen <tj.groenen@gmail.com>
Sun, 27 Jan 2013 12:38:01 +0000 (13:38 +0100)
committerDennis Groenen <tj.groenen@gmail.com>
Sun, 27 Jan 2013 12:38:01 +0000 (13:38 +0100)
commit569901932f8fc6ae4e92b526aeba45bd9cfb410e
tree9d00b6c218454faaa217a2dfe885367e9fc9d3b6
parentfffed0e4d1060d31c870434b5080b038d8d1b9ed
parentccee4c3e19977590921c39e22598a8645e03b07d
Merge branch 'master' into thumb

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