From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 11 May 2013 10:46:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=099f4a9ec705c0ed09ae11815c08381b1d61041b;p=people%2Fmfischer%2Fipfire-2.x.git

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

099f4a9ec705c0ed09ae11815c08381b1d61041b