From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 20 Apr 2014 12:53:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/pcre'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ae051d9231acddf0ad7810a72ef1c9cd5316d7d;p=people%2Fms%2Fipfire-3.x.git

Merge remote-tracking branch 'stevee/pcre'

Conflicts:
	pcre/pcre.nm
---

8ae051d9231acddf0ad7810a72ef1c9cd5316d7d
diff --cc pcre/pcre.nm
index 506d82754,782b43824..a9cc86c38
--- a/pcre/pcre.nm
+++ b/pcre/pcre.nm
@@@ -4,8 -4,8 +4,8 @@@
  ###############################################################################
  
  name       = pcre
 -version    = 8.34
 -release    = 3
 +version    = 8.35
- release    = 1
++release    = 2
  
  compat_version = 8.21