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

[Sergio Pascual]

commit e149822a29918c2da09aef7290c3feb6de13d19e
Merge: c439cb8 7758f52
Author: Pasrario <harenawer at zoho.com>
Date:   Wed Dec 19 11:53:46 2012 +0100

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

 rst2pdf.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc rst2pdf.spec
index 77263d4,1b87f32..373bb2e
--- a/rst2pdf.spec
+++ b/rst2pdf.spec
@@@ -42,9 -44,9 +42,13 @@@ don
  %{python_sitelib}/%{name}*
  
  %changelog
++
 +* Wed Dec 19 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 0.93-1
 +- New upstream version 0.93
 +
+ * Fri Dec 07 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 0.92-4
+ - Fix wrong URL
+ 
  * Fri Jul 27 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 0.92-3
  - Fix for bz #842800