Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 7 Jan 2014 19:22:53 +0000 (20:22 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 7 Jan 2014 19:22:53 +0000 (20:22 +0100)

Trivial merge