]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commit
fix merge problem.
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 26 Sep 2014 02:13:45 +0000 (04:13 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 26 Sep 2014 02:13:45 +0000 (04:13 +0200)
commit9a0ba6de9658ef0faaa1df279f1712a009409eab
treeaf6ead6950b82794dc2fd93297f792e420a98727
parent61466ab18dff0dc9809578f2e5d810a6a16d9aa4
fix merge problem.
config/rootfiles/core/82/filelists/iputils [deleted symlink]
config/rootfiles/core/82/filelists/openssl-compat [deleted symlink]