From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 20 Jul 2012 07:08:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'ms/thirteen' into kernel-update
X-Git-Tag: v2.13-beta1~256^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68ad7a1ab89eeac485ca85667fb43db3c6431e34;p=ipfire-2.x.git

Merge remote-tracking branch 'ms/thirteen' into kernel-update
---

68ad7a1ab89eeac485ca85667fb43db3c6431e34