From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 12 Jun 2014 14:21:41 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.15-core79~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acac5f2cf8a1443067f3baa3c94e3a3cdbdb4661;p=ipfire-2.x.git

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

acac5f2cf8a1443067f3baa3c94e3a3cdbdb4661