Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Dec 2013 13:09:02 +0000 (14:09 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Dec 2013 13:09:02 +0000 (14:09 +0100)

Trivial merge