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

[Rex Dieter]

commit 669c55ee2bd530a39a23b3026d4dda2083b7f6b0
Merge: 4b98fc8 5d3f483
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jul 19 11:22:20 2012 -0500

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

 tomahawk.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc tomahawk.spec
index c3426fc,d1bdeda..71cd601
--- a/tomahawk.spec
+++ b/tomahawk.spec
@@@ -96,9 -98,9 +98,12 @@@ f
  
  
  %changelog
 +* Thu Jul 19 2012 Rex Dieter <rdieter at fedoraproject.org> 0.5.4-1
 +- tomahawk-0.5.4
 +
+ * Sat Jul 14 2012 Rex Dieter <rdieter at fedoraproject.org> 0.5.2-2
+ - update scriptlet(s)
+ 
  * Tue Jul 03 2012 Rex Dieter <rdieter at fedoraproject.org> 0.5.2-1
  - tomahawk-0.5.2