From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 22 Aug 2010 19:40:42 +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=c0e77052cf6dd8e87cf3200bd3019c32251e2076;p=ipfire.org.git

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

c0e77052cf6dd8e87cf3200bd3019c32251e2076