From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 5 Jan 2012 15:07:00 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f26ad8535e941eabe44a7ced807cba197bd8271;p=ipfire-3.x.git

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

Conflicts:
	openssl/openssl.nm
---

1f26ad8535e941eabe44a7ced807cba197bd8271
diff --cc openssl/openssl.nm
index 1edeeffd2,180174970..4c27b89f0
--- a/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