From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 20 Aug 2010 17:36:26 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3470d8df792569d1d66edb411fc37fc94b99c74c;p=ipfire.org.git

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

3470d8df792569d1d66edb411fc37fc94b99c74c