From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 18 May 2013 14:53:10 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.13-core69~8^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=464d238a61a102ff0729f2cc3c23f05dab03aa87;hp=-c;p=people%2Fpmueller%2Fipfire-2.x.git

Merge branch 'master' into next
---

464d238a61a102ff0729f2cc3c23f05dab03aa87