Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 8 Sep 2013 13:26:47 +0000 (15:26 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 8 Sep 2013 13:26:47 +0000 (15:26 +0200)

Trivial merge