From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 11 Aug 2013 09:51:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=9e78ce6142549d6d786fe97c56bf58df6b81e80f

Merge remote-tracking branch 'origin/next'
---

9e78ce6142549d6d786fe97c56bf58df6b81e80f