1536679 Merge branch 'update-to-version-3.x'

Merged and Committed by msrb 11 years ago
    Merge branch 'update-to-version-3.x'
    
    Conflicts:
    	maven-compiler-plugin.spec
    
        
file modified
+1 -0
file modified
+23 -54
file modified
+1 -1