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)
commite75acaa354824dbf5a6fb50bbedf8b7f467c9c7b
tree9d16892f5187359a7a7fffccf1a83d89f3e10d8b
parentf873291595337ee3aa7afa46fa6ef2c079ede5c6
parent8697224971ec5cdbdd45b1f11432f70e07b87b68
Merge remote-tracking branch 'enrico/master'

* enrico/master:
  Added python-markdown
  nm.debian.org: added python-django-south and postgresql-client