Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
	openssl/openssl.nm

diff --cc openssl/openssl.nm
index 1edeeffd2fdf3120c56d4a90dd16c52208327e74,1801749701ba761b8fc50038a570bac2fb95e679..4c27b89f00d28f1aca7536639242d8898a25a354
--- 1/openssl/openssl.nm
--- 2/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@@ -4,8 -4,8 +4,8 @@@
  ###############################################################################
  
  name       = openssl
 -version    = 1.0.0e
 -release    = 4
 +version    = 1.0.0f
- release    = 1
++release    = 2
  
  maintainer = Michael Tremer <michael.tremer@ipfire.org>
  groups     = System/Libraries