From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 8 Jan 2012 15:38:51 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d5a7f29fe9a8390d70f5ddeb45fdc8b8f19d84d;p=ipfire-3.x.git

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

5d5a7f29fe9a8390d70f5ddeb45fdc8b8f19d84d