Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 1 May 2014 09:30:48 +0000 (11:30 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 1 May 2014 09:30:48 +0000 (11:30 +0200)

Trivial merge