Merge branch 'master' into thumb
authorDennis Groenen <tj.groenen@gmail.com>
Sun, 18 Aug 2013 09:31:21 +0000 (11:31 +0200)
committerDennis Groenen <tj.groenen@gmail.com>
Sun, 18 Aug 2013 09:31:21 +0000 (11:31 +0200)
commit1f81f8c5ce158fe8a5b4d3416e9d37ab84df611f
treeb1fd835c231ad998851bfe83f67543c35e68f2d8
parent57fa914b3c77fe10475080bc2e13c1f69d38096b
parentdc5471e56037888f7096635a598ccfa36046ef3b
Merge branch 'master' into thumb

Conflicts:

debian/changelog
debian/changelog