From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 19 Nov 2012 22:50: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=03cb85b498ff18de25d9c17a400091d70e79a3fc;p=ipfire-3.x.git

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

03cb85b498ff18de25d9c17a400091d70e79a3fc