From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 16 Jul 2014 21:25:20 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.15-core80~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a99677dd6d6251dbe1cc8b70f7e55957230ac29;p=ipfire-2.x.git

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

3a99677dd6d6251dbe1cc8b70f7e55957230ac29