From: Peter Pfeiffer Date: Fri, 22 May 2009 17:52:41 +0000 (+0200) Subject: Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x X-Git-Tag: v2.5-rc1~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53bd94654892c7bad524625a6a426e694c7caeb0;p=people%2Fstevee%2Fipfire-2.x.git Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x --- 53bd94654892c7bad524625a6a426e694c7caeb0