From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 16 Dec 2011 15:41:09 +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=f87db2d06cf67cd37a5daca115dd0f558f17b45e;p=ipfire-3.x.git

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

f87db2d06cf67cd37a5daca115dd0f558f17b45e