From 6c662e53f3983e1ac68c3ad44263f9cd23723004 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Oct 19 2013 06:39:17 +0000
Subject: Merge branch 'master' into el6


Conflicts:
	pysnmp.spec

---

diff --git a/pysnmp.spec b/pysnmp.spec
index 0257717..6a7153c 100644
--- a/pysnmp.spec
+++ b/pysnmp.spec
@@ -40,6 +40,9 @@ networking.
 * Fri Oct 18 2013 Fabian Affolter <mail@fabian-affolter.ch> - 4.2.5-1
 - Updated to new upstream version 4.2.5
 
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Tue Feb 19 2013 Fabian Affolter <mail@fabian-affolter.ch> - 4.2.4-1
 - Updated to new upstream version 4.2.4