]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07f0e77 c366dbb)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 17 Mar 2015 19:42:17 +0000 (20:42 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 17 Mar 2015 19:42:17 +0000 (20:42 +0100)
1  2 
lfs/openssl-compat patch | diff1 | diff2 | blob | history

diff --cc lfs/openssl-compat
Simple merge
IPFire 2.x development tree