Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Sep 2013 12:46:45 +0000 (14:46 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Sep 2013 12:46:45 +0000 (14:46 +0200)

Trivial merge