From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Dec 2011 22:31:33 +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=84c1f287f014cff3ec88d88eee918213948056cc;p=ipfire-3.x.git

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

84c1f287f014cff3ec88d88eee918213948056cc