]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fffb016 e0b9a60)
Merge remote-tracking branch 'origin/next' into kernel-test
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 29 Mar 2015 17:33:04 +0000 (19:33 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 29 Mar 2015 17:33:04 +0000 (19:33 +0200)
Conflicts:
lfs/openssl-compat

1  2 
lfs/openssl-compat patch | diff1 | diff2 | blob | history

diff --cc lfs/openssl-compat
Simple merge
Peter's tree of IPFire 2.x