[gource: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/gource

[Siddhesh Poyarekar]

commit 669fcf1a49f3e08a39bb14fefaf4fca35b01b5da
Merge: ab4af6e 72de5ab
Author: Siddhesh Poyarekar <siddhesh.poyarekar at gmail.com>
Date:   Fri Feb 11 15:38:14 2011 +0530

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/gource
    
    Conflicts:
    	gource.spec

 gource.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc gource.spec
index 586712f,d3e86e2..6f2b317
--- a/gource.spec
+++ b/gource.spec
@@@ -58,9 -58,9 +58,12 @@@ rm -rf %{buildroot
  %{_datadir}/gource/*
  
  %changelog
 +* Fri Feb 11 2011 Siddhesh Poyarekar <siddhesh at redhat.com> - 0.29-1
 +- New upstream 0.29
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.28-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Sat Aug 28 2010 Siddhesh Poyarekar <spoyarek at redhat.com> - 0.28-1
  - New upstream 0.28