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

Trivial merge