chiark / gitweb /
Merge remote-tracking branch 'enrico/master'
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 29 Aug 2013 19:46:18 +0000 (21:46 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 29 Aug 2013 19:46:18 +0000 (21:46 +0200)
* enrico/master:
  Added python-markdown
  nm.debian.org: added python-django-south and postgresql-client


Trivial merge