Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 31 May 2015 18:08:58 +0000 (20:08 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 31 May 2015 18:08:58 +0000 (20:08 +0200)
Conflicts:
lfs/netsnmpd


Trivial merge