Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Aug 2014 07:17:27 +0000 (09:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Aug 2014 07:17:27 +0000 (09:17 +0200)
Conflicts:
lfs/iputils

1  2 
config/rootfiles/common/iputils