[groovy/f16: 3/3] Merge branch 'master' into f16

[hannes]

commit d406820cabd3f4c15e08ebc57b4432a33267bf91
Merge: cfb333f 8f6efee
Author: hannes <hannes at fedoraproject.org>
Date:   Sun Nov 20 15:48:03 2011 +0000

    Merge branch 'master' into f16
    
    Conflicts:
    	groovy.spec
    
    Update to 1.8.4

 .gitignore  |    1 +
 groovy.spec |   10 ++++++++--
 sources     |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --cc groovy.spec
index f61ae17,7b73f75..e5d83d0
--- a/groovy.spec
+++ b/groovy.spec
@@@ -158,9 -158,14 +158,15 @@@ install -p -m644 pom.xml $RPM_BUILD_ROO
  
  
  %changelog
- * Sun Oct 16 2011 Johannes Lips <hannes at fedoraproject.org> - 1.8.3-1
+ * Sun Nov 20 2011 Johannes Lips <hannes at fedoraproject.org> - 1.8.4-1
+ - Update to 1.8.4
+ 
+ * Thu Oct 13 2011 Johannes Lips <hannes at fedoraproject.org> - 1.8.3-2
+ - remove the nojansi patch since jansi is in fedora
+ 
+ * Thu Oct 13 2011 Johannes Lips <hannes at fedoraproject.org> - 1.8.3-1
  - Update to 1.8.3
 +- remove the nojansi patch since jansi is in fedora
  
  * Tue Sep 06 2011 Johannes Lips <hannes at fedoraproject.org> - 1.8.2-1
  - Update to 1.8.2