From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 24 Sep 2014 18:39:43 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.15-core83~5
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=a4c895e569730bb73496907c748a18a17b6045be

Merge branch 'master' into next
---

a4c895e569730bb73496907c748a18a17b6045be