From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 21 Feb 2015 15:59:50 +0000 (+0100)
Subject: Merge branch 'core87' of git.ipfire.org:/pub/git/ipfire-2.x into core87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=362acbabe51fe15147c58d78364a3fa22e7e1c55;p=people%2Fms%2Fipfire-2.x.git

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

362acbabe51fe15147c58d78364a3fa22e7e1c55