From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 22 Aug 2014 07:17:27 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bd0bfd233b2297a3c2e91e90b56fdfd96011c3b;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
	lfs/iputils
---

9bd0bfd233b2297a3c2e91e90b56fdfd96011c3b
diff --cc config/rootfiles/common/iputils
index 934b55509a,7fb0426750..3484cbb244
--- a/config/rootfiles/common/iputils
+++ b/config/rootfiles/common/iputils
@@@ -1,2 -1,2 +1,3 @@@
+ bin/ping
  usr/bin/ping
 +usr/bin/tracepath