From: Christian Schmidt Date: Thu, 20 Jan 2011 19:11:04 +0000 (+0100) Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x X-Git-Tag: v2.9-core45~1^2~28 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d846fee0378b8c7e56229d69d47ec0008c45309c Merge branch 'master' of git://git.ipfire.org/ipfire-2.x --- d846fee0378b8c7e56229d69d47ec0008c45309c