chiark / gitweb /
Merge commit 'pkern/master'
authorPeter Palfrader <peter@palfrader.org>
Fri, 26 Mar 2010 12:22:54 +0000 (13:22 +0100)
committerPeter Palfrader <peter@palfrader.org>
Fri, 26 Mar 2010 12:22:54 +0000 (13:22 +0100)
* commit 'pkern/master':
  buildd.debian.org: add php5
  buildd.debian.org: add python-nose

Signed-off-by: Peter Palfrader <peter@palfrader.org>

Trivial merge