From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 15 Jul 2015 21:21:53 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/?p=people%2Famarx%2Fipfire-3.x.git;a=commitdiff_plain;h=698a0581e5c2bfd7f83859a4f3b5fb4267c1c573

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

698a0581e5c2bfd7f83859a4f3b5fb4267c1c573