From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 18 Jan 2011 15:12:43 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=583973b1fc42870a88c16c5eb0557012ff2c97b0;p=ipfire.org.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
---

583973b1fc42870a88c16c5eb0557012ff2c97b0