From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 23 Aug 2014 15:06:40 +0000 (+0200)
Subject: Merge branch 'core82' of ssh://git.ipfire.org/pub/git/ipfire-2.x into core82
X-Git-Tag: v2.15-core82~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d18925c39a586328ffddf4bb92a13f29190aa29a;p=ipfire-2.x.git

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

d18925c39a586328ffddf4bb92a13f29190aa29a