Merge branch 'master' into experimental
commitefe1367d242703e455f408b87377961e602dc117
authorAlessio Treglia <alessio@debian.org>
Fri, 9 Mar 2012 12:39:11 +0000 (9 13:39 +0100)
committerAlessio Treglia <alessio@debian.org>
Fri, 9 Mar 2012 12:39:11 +0000 (9 13:39 +0100)
tree9570e504ca39c80cfaf3098543eb949017ec5f62
parent4c88da07d22f803a988ec6c5f4d81de4ec380db8
parent00224e2ae47775f37e4ac7786430167001ba7711
Merge branch 'master' into experimental