Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 24 Jun 2014 06:05:39 +0000 (08:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 24 Jun 2014 06:05:39 +0000 (08:05 +0200)

Trivial merge