From: Arne Fitzenreiter <Arne_F@ipfire.org>
Date: Fri, 26 Oct 2012 13:40:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into thirteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=1d12008db5c86f06c70600ea2ac9cc0721af6d9b

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

1d12008db5c86f06c70600ea2ac9cc0721af6d9b