From e4d4c1846a806d03b83109c4534b1fbb24aba3c1 Mon Sep 17 00:00:00 2001
From: Steve Milner <stevem@gnulinux.net>
Date: Jun 24 2011 14:21:39 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-pygments


Conflicts:
	python-pygments.spec

---

diff --git a/python-pygments.spec b/python-pygments.spec
index c18cae0..f5bb811 100644
--- a/python-pygments.spec
+++ b/python-pygments.spec
@@ -203,6 +203,9 @@ popd
 - update for upstream release
 - Add python2.6 support done by Steve Traylen <steve.traylen@cern.ch>. BZ#662755.
 
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Wed Aug 25 2010 Thomas Spura <tomspur@fedoraproject.org> - 1.3.1-7
 - update to most recent python guidelines
 - rebuild with python3.2