[ghc-hjsmin: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/ghc-hjsmin

[Ricky Elrod]

commit 19ff07b737dab88e895e6e127ca396ec12868cb5
Merge: c3c835c 5fded2a
Author: Ricky Elrod <ricky at elrod.me>
Date:   Mon May 12 00:38:34 2014 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ghc-hjsmin
    
    Conflicts:
    	ghc-hjsmin.spec

 ghc-hjsmin.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc ghc-hjsmin.spec
index 5a3104f,d98b101..c19baff
--- a/ghc-hjsmin.spec
+++ b/ghc-hjsmin.spec
@@@ -66,9 -66,9 +66,12 @@@ This package provides the development f
  
  
  %changelog
- * Thu Apr 10 2014 Ricky Elrod <codeblock at fedoraproject.org> - 0.1.4.6-1
++* Mon May 12 2014 Ricky Elrod <relrod at redhat.com> - 0.1.4.6-1
 +- Latest upstream release.
 +
+ * Thu Apr 24 2014 Jens Petersen <petersen at redhat.com> - 0.1.4.4-5
+ - rebuild
+ 
  * Mon Jan 20 2014 Ricky Elrod <codeblock at fedoraproject.org> - 0.1.4.4-4
  - Rebuild again.