[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 64066d987ad12cb64d210c777c556315570c5a62

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 64066d987ad12cb64d210c777c556315570c5a62

[git]

[-- Attachment #1: Type: text/plain, Size: 3032 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  64066d987ad12cb64d210c777c556315570c5a62 (commit)
       via  be4e2621764393af1b51a39132dfbeeda01dfe80 (commit)
       via  65fa3708f240912fc0f26afb0f7997fe06deda93 (commit)
      from  156e58afd4403bc53a2c0ea075a6745bdb89d405 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 64066d987ad12cb64d210c777c556315570c5a62
Merge: 65fa370 be4e262
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Oct 18 21:22:58 2012 +0200

    Merge remote-tracking branch 'ummeegge/ovpn-update'

commit be4e2621764393af1b51a39132dfbeeda01dfe80
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date:   Thu Oct 18 21:03:15 2012 +0200

    openvpn: Update to 2.2.2.

commit 65fa3708f240912fc0f26afb0f7997fe06deda93
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date:   Thu Oct 18 20:55:25 2012 +0200

    patch: Update to 2.7.1.
    
    Fixes #10237.

-----------------------------------------------------------------------

Summary of changes:
 openvpn/openvpn.nm |    4 ++--
 patch/patch.nm     |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/openvpn/openvpn.nm b/openvpn/openvpn.nm
index 5605145..91e8394 100644
--- a/openvpn/openvpn.nm
+++ b/openvpn/openvpn.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = openvpn
-version    = 2.2.1
-release    = 2
+version    = 2.2.2
+release    = 1
 
 groups     = Networking/VPN
 url        = http://openvpn.net/
diff --git a/patch/patch.nm b/patch/patch.nm
index 48b6687..9a96a32 100644
--- a/patch/patch.nm
+++ b/patch/patch.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = patch
-version    = 2.7
+version    = 2.7.1
 release    = 1
 
 groups     = Development/Tools
@@ -13,10 +13,10 @@ license    = GPLv2+
 summary    = Utility for modifying/upgrading files.
 
 description
-	The patch program applies diff files to originals. The diff \
-	command is used to compare an original to a changed file.\
-	 Diff lists the changes made to the file. A person who has \
-	the original file can then use the patch command with the \
+	The patch program applies diff files to originals. The diff
+	command is used to compare an original to a changed file.
+	Diff lists the changes made to the file. A person who has
+	the original file can then use the patch command with the
 	diff file to add the changes to their original file.
 end
 


hooks/post-receive
--
IPFire 3.x development tree