[javapackages-tools/f20: 17/17] Merge branch 'master' into f20

[Stanislav Ochotnicky]

commit 63043696d076f0fa20bea30aded65ba74ff10d09
Merge: 7184111 95a15c4
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Sep 25 15:10:15 2013 +0200

    Merge branch 'master' into f20
    
    Conflicts:
    	javapackages-tools.spec

 .gitignore                        |   13 ++++
 google-guice-sisu-guice-noaop.xml |   50 ++++++++++++++++
 javapackages-tools.spec           |  113 ++++++++++++++++++++++++++++++++++---
 sources                           |    2 +-
 4 files changed, 169 insertions(+), 9 deletions(-)
---
diff --cc javapackages-tools.spec
index f68e96f,050d8f8..1f1ac52
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@@ -1,6 -1,6 +1,7 @@@
  Name:           javapackages-tools
- Version:        2.0.1
- Release:        2%{?dist}
+ Version:        3.2.4
+ Release:        1%{?dist}
++
  Summary:        Macros and scripts for Java packaging support
  
  License:        BSD