[ttname/f18: 2/2] Merge branch 'master' into f18

[T.C. Hollingsworth]

commit 8bf23670522c34ef4060ed6969f8d55bbcc978d6
Merge: 61481cf c206d3d
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Thu Aug 29 04:14:04 2013 -0700

    Merge branch 'master' into f18
    
    Conflicts:
    	ttname.spec

 ttname.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc ttname.spec
index e437e6e,add4607..467bcb6
--- a/ttname.spec
+++ b/ttname.spec
@@@ -49,8 -44,8 +49,11 @@@ nosetests -v
  %doc LICENSE
  
  %changelog
+ * Thu Aug 29 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1-2
+ - use python2 in the right place
+ 
 +* Wed Aug 28 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1-1.1
 +- add patch to fix test suite failure in F<=18
 +
  * Tue Aug 27 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1-1
  - initial release