Merge branch 'master' into experimental
authorJulien Valroff <julien@kirya.net>
Mon, 28 Feb 2011 20:46:11 +0000 (21:46 +0100)
committerJulien Valroff <julien@kirya.net>
Mon, 28 Feb 2011 20:46:11 +0000 (21:46 +0100)
commit0054e990dc67bf84b00d59ef41d76c0d5a7dd62f
tree33a0f14facfbb621efacd21b7f2bba4e7bc1297d
parentef5b8b8ccb115b56d81bd85f83b913d9e7f76c89
parent4a3e32d8292908809e195e8708c8e070f5ac04a2
Merge branch 'master' into experimental

Conflicts:
debian/changelog
debian/copyright
debian/patches/series
debian/changelog
debian/copyright