Merge branch 'master' into thumb
authorDennis Groenen <tj.groenen@gmail.com>
Sat, 16 Mar 2013 12:05:01 +0000 (13:05 +0100)
committerDennis Groenen <tj.groenen@gmail.com>
Sat, 16 Mar 2013 12:05:01 +0000 (13:05 +0100)
commit15684b84858f1a93ffeea920bc0fd21803a6bd82
tree2ca56ba7ab418e480b9f360c9e1555042e6b4e1e
parent9357cc3e0597f9a9f960cf64531fb2f9051f8271
parent60a0db246ecce1a1228b95bb1df39b37af29c03c
Merge branch 'master' into thumb

Conflicts:
debian/changelog
debian/changelog