From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 20 Feb 2010 21:05:34 +0000 (+0100)
Subject: Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.9-beta1~453
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=82bca50c9c5fd587ac1ee033ad9e86335502ad94;hp=82bca50c9c5fd587ac1ee033ad9e86335502ad94

Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x
---