From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 27 Apr 2014 17:38:05 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=9e244b246b664b03850fdfe1200633b3df7d190b;hp=-c

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

9e244b246b664b03850fdfe1200633b3df7d190b