From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 10 Jul 2014 17:17:45 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.15-core80~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=510e4cc9c184adc0a58624a9b3c15181c1f38dfb;p=ipfire-2.x.git

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

510e4cc9c184adc0a58624a9b3c15181c1f38dfb