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)
commit9bd0bfd233b2297a3c2e91e90b56fdfd96011c3b
tree237d3c3ca481c16c38ce60344896321a566ca2de
parent6b271ee283d7b62b92d099f5140a3f4e1b95257e
parent05370b30da58d10f9935cf1c4cb8f23ab769b32e
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
lfs/iputils
config/rootfiles/common/iputils