From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 6 Aug 2014 07:36:31 +0000 (+0200)
Subject: Merge branch 'master' of git.ipfire.org:/pub/git/ipfire-2.x
X-Git-Tag: v2.15-core81~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0a3d81c123cece4c25227c71c983a45594715e7;p=ipfire-2.x.git

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

a0a3d81c123cece4c25227c71c983a45594715e7