From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 8 Jan 2009 21:09:41 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7b98d17d3112d279276932cec389fb5bbba5d74;p=ipfire-3.x.git

Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
---

c7b98d17d3112d279276932cec389fb5bbba5d74