From: Joerg Jaspert Date: Mon, 2 Aug 2010 02:11:56 +0000 (+0200) Subject: Merge remote branch 'pkern/to-merge' into merge X-Git-Tag: debian-r/squeeze~631 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f13dba553ef12621b3464caa6d3a6f45cf80bfaf;hp=-c;p=dak.git 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 --- f13dba553ef12621b3464caa6d3a6f45cf80bfaf