From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Jan 2012 20:13:54 +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=10165db27f1c1e4170b7985bc8fbf8179e910e62;p=ipfire-3.x.git

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

10165db27f1c1e4170b7985bc8fbf8179e910e62