Merge branch 'master' into diablo
authorDennis Groenen <tj.groenen@gmail.com>
Sun, 18 Aug 2013 09:33:11 +0000 (11:33 +0200)
committerDennis Groenen <tj.groenen@gmail.com>
Sun, 18 Aug 2013 09:33:11 +0000 (11:33 +0200)
commit1d2af999e98662fe736791570d06ea7770581bfa
tree3d01c73ad81308f4be495cdd138777c15e5fe102
parentc41664ae9185fad05c221dae6588444f4d2ec195
parentdc5471e56037888f7096635a598ccfa36046ef3b
Merge branch 'master' into diablo

Conflicts:

debian/changelog
debian/patches/series
debian/changelog
debian/patches/series