From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 31 May 2009 11:11:52 +0000 (+0200)
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=2983452686d70519407011be300885e2d1828bf5;p=ipfire-3.x.git

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

2983452686d70519407011be300885e2d1828bf5