From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 18 Jul 2014 12:55:47 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94abd48b1c666f7ec1009515ffb651f522f9f89b;p=people%2Fteissler%2Fipfire-2.x.git

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

94abd48b1c666f7ec1009515ffb651f522f9f89b