From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 28 Mar 2009 21:11:42 +0000 (+0100)
Subject: Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb1fd85f1d53c2481be4f816005f0430c5021e6d;p=ipfire-3.x.git

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

bb1fd85f1d53c2481be4f816005f0430c5021e6d