[python-tahrir: 2/2] Mergeing in changes from the f18 rebuild

[Ross Delinger]

commit 27ba75d5ff176a7afd8e414ad943c6ab7a2ff938
Merge: a836293 5c36440
Author: Ross Delinger <rossdylan at csh.rit.edu>
Date:   Mon Jul 23 14:56:47 2012 -0400

    Mergeing in changes from the f18 rebuild

 python-tahrir.spec |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --cc python-tahrir.spec
index a01ff52,0786db0..f0f9b6a
--- a/python-tahrir.spec
+++ b/python-tahrir.spec
@@@ -57,10 -57,8 +57,12 @@@ The name is total overkill
  
  
  %changelog
 +* Mon Jul 23 2012 rossdylan <rdelinge at redhat.com> 0.1.8-1
 +- Versioning typo in rpm fixed
 +- Misc bug fixes 
 +- Custom 404 page
 +- oauth authentication, defaults to FAS
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.6-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
  * Wed Jun 20 2012 rossdylan <rossdylan at csh.rit.edu> 0.1.6-1
  - initial package for Fedora