From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 1 Jan 2012 12:11:04 +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=1c3676969e13010abb24838d58b5b67d86d5f025;p=ipfire-3.x.git

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

1c3676969e13010abb24838d58b5b67d86d5f025