Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 8 May 2014 14:15:13 +0000 (16:15 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 8 May 2014 14:15:13 +0000 (16:15 +0200)

Trivial merge