From: Dirk Wagner Date: Fri, 16 Jul 2010 07:56:12 +0000 (+0200) Subject: Merge branch 'master' of ssh://glotzi@git.ipfire.org/pub/git/ipfire-2.x X-Git-Tag: v2.9-beta1~157 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e40a86400db3cfa8eb38f55732a5aaf186184765;hp=-c Merge branch 'master' of ssh://glotzi@git.ipfire.org/pub/git/ipfire-2.x --- e40a86400db3cfa8eb38f55732a5aaf186184765