From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 28 Feb 2014 06:04:45 +0000 (+0100)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82a4a102f3eaa4d1d706a654cb940596714871d2;p=people%2Ffbuehrle%2Fipfire-2.x.git

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

82a4a102f3eaa4d1d706a654cb940596714871d2