From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 23 Dec 2012 11:01:41 +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=cb5b1e1436df5269259e2cec7ff2bd2d9c489402;p=ipfire-3.x.git

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

cb5b1e1436df5269259e2cec7ff2bd2d9c489402