]> err.no Git - dak/commit
Merge remote branch 'pkern/to-merge' into merge
authorJoerg Jaspert <joerg@debian.org>
Mon, 2 Aug 2010 02:11:56 +0000 (04:11 +0200)
committerJoerg Jaspert <joerg@debian.org>
Mon, 2 Aug 2010 02:11:56 +0000 (04:11 +0200)
commitf13dba553ef12621b3464caa6d3a6f45cf80bfaf
treed910b0c87dfcfc69395a46e5a241f4db327b6e75
parent255e810a2463fee08bd37234e1c50a92f886417e
parentd95f1d6f1739047cbf1c853d07f4977748096fe9
Merge remote branch 'pkern/to-merge' into merge

* pkern/to-merge:
  config/debian/apache.conf-incoming: add vitry and krenek
  config/debian/apache.conf-incoming: cleanup a bit
  config/debian/apache.conf-incoming: add new armel buildds

Signed-off-by: Joerg Jaspert <joerg@debian.org>