[maven-compiler-plugin: 4/4] Merge branch 'update-to-version-3.x'

[Michal Srb]

commit 1536679f7dd33480241b8ddd2246429ced336d8d
Merge: 3300605 f200eda
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Mar 7 10:06:51 2013 +0100

    Merge branch 'update-to-version-3.x'
    
    Conflicts:
    	maven-compiler-plugin.spec

 .gitignore                 |    1 +
 maven-compiler-plugin.spec |   77 +++++++++++++------------------------------
 sources                    |    2 +-
 3 files changed, 25 insertions(+), 55 deletions(-)
---