[python-yourls: 1/2] merged changes from origin

[Tim Flink]

commit e85147a87da2eba5ac5b7bb14c7917f383976683
Merge: b0ab890 6cb9f70
Author: Tim Flink <tflink at fedoraproject.org>
Date:   Mon Nov 14 10:21:44 2011 -0700

    merged changes from origin

 python-yourls.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc python-yourls.spec
index 8fece5d,e10cd91..769f1af
--- a/python-yourls.spec
+++ b/python-yourls.spec
@@@ -43,10 -43,9 +43,13 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Mon Nov 14 2011 Tim Flink <tflink at fedoraproject.org> - 0.1.2-1
 +- Fixed bug where empty api urls were allowed
 +- Added ability to use 'title' when shortening a URL
 +
+ * Tue Oct 11 2011 Tim Flink <tflink at fedoraproject.org> - 0.1.1-3
+ - removed extra chars in spec file that were breaking build
+ 
  * Tue Aug 30 2011 Tim Flink <tflink at fedoraproject.org> - 0.1.1-2
  - corrected license tag