Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 14 Jun 2014 20:13:37 +0000 (22:13 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 14 Jun 2014 20:13:37 +0000 (22:13 +0200)

Trivial merge