Merge branch 'upstream'
authorRaphaël Hertzog <hertzog@debian.org>
Fri, 4 Oct 2013 07:49:32 +0000 (09:49 +0200)
committerRaphaël Hertzog <hertzog@debian.org>
Fri, 4 Oct 2013 07:49:32 +0000 (09:49 +0200)
commitfc710dd2da160be6af5492e1b8f1829fd29600bb
tree8f8691052bb1dec9c7e110eec017db5dc86b1801
parenta9c7a2944b69a393f42ab9b74dae9a0b6376c0dd
parent1ac06c6217871d6499adf939b56b818a157b3be9
Merge branch 'upstream'