]> git.donarmstrong.com Git - dak.git/commitdiff
projects / dak.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 255e810 d95f1d6)
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)
* 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>

Trivial merge
Mirror of Debian's archive software (dak)