Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Apr 2015 19:58:09 +0000 (21:58 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Apr 2015 19:58:09 +0000 (21:58 +0200)
Conflicts:
lfs/monit


Trivial merge