Merge branch 'core87' of git.ipfire.org:/pub/git/ipfire-2.x into core87
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Feb 2015 15:59:50 +0000 (16:59 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Feb 2015 15:59:50 +0000 (16:59 +0100)

Trivial merge