Merge branch 'master' into thumb
authorDennis Groenen <tj.groenen@gmail.com>
Sat, 13 Oct 2012 14:24:02 +0000 (16:24 +0200)
committerDennis Groenen <tj.groenen@gmail.com>
Sat, 13 Oct 2012 14:24:02 +0000 (16:24 +0200)
commit171bd71252c7285f3e209f9bf790effac7bf243e
treea928495f12934c66dcf29481a856c1b941fa34f4
parentc9cb9e6037c49ea1ac9b94e712d8d4adac7737a9
parent24d0a1a51bdd80e7153fe8e9a17b6fd782ed196b
Merge branch 'master' into thumb

Conflicts:
debian/changelog
debian/changelog