Merge branch 'upstream'
authorLuk Claes <luk@debian.org>
Fri, 10 May 2013 08:09:21 +0000 (10:09 +0200)
committerLuk Claes <luk@debian.org>
Fri, 10 May 2013 08:09:21 +0000 (10:09 +0200)
commit188e5ae9789bf0a7f8033f6aae40e65e652c7b08
treeb32584a2dd1e230b135a8d34482db4ebc276e39d
parentd3143a07f71a7177aca9391dcf50be46ef9d5eea
parente0b66eaad419b466ecfac1b82d4802bb5fb676d0
Merge branch 'upstream'