chiark / gitweb /
Merge branch 'master' of git://anonscm.debian.org/mirror/debian.org
authorEnrico Zini <enrico@enricozini.org>
Thu, 29 Aug 2013 09:34:55 +0000 (11:34 +0200)
committerEnrico Zini <enrico@enricozini.org>
Thu, 29 Aug 2013 09:34:55 +0000 (11:34 +0200)
commit2988281c1d98452c3024ad03c7a1be9f4ecdc1bc
treee5646058193be95caf29fded38f25307a64a71a4
parent286cc31d8c9402a0531bccf86a939fe966066c74
parentf873291595337ee3aa7afa46fa6ef2c079ede5c6
Merge branch 'master' of git://anonscm.debian.org/mirror/debian.org

Conflicts:
debian/changelog
debian/changelog