[java-sig-commits] [maven-ant-tasks/f15/master: 3/3] Merge branch 'master' into f15

[Stanislav Ochotnicky]

commit 1622e28f6b744500ba1690e890d3b6c04966a52c
Merge: 883e455 5554eba
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Feb 16 17:59:24 2011 +0100

    Merge branch 'master' into f15
    
    Go back to linear history.
    
    Conflicts:
    	maven-ant-tasks.spec

 maven-ant-tasks.spec |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---