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

[Paul Komkoff]

commit e0de5f25510b93335783a98b6cc4a5c8259b205e
Merge: 7e45491 fa70f5a
Author: Paul P. Komkoff <i at stingr.net>
Date:   Mon Mar 25 00:43:19 2013 +0400

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

 roundup.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc roundup.spec
index 5f9f255,809b680..568cdff
--- a/roundup.spec
+++ b/roundup.spec
@@@ -91,9 -91,9 +91,12 @@@ rm -rf $RPM_BUILD_ROO
  %doc %{_defaultdocdir}/%{name}/*
  
  %changelog
- * Thu Jan 24 2013 Paul P. Komkoff Jr <i at stingr.net> - 1.4.21-1
++* Mon Mar 25 2013 Paul P. Komkoff Jr <i at stingr.net> - 1.4.21-1
 +- new upstream version
 +
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.20-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Fri Nov  9 2012 Paul P. Komkoff Jr <i at stingr.net> - 1.4.20-1
  - new upstream version