merge JABAWS_Release_2_1 into develop
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Mon, 29 Jul 2013 12:58:12 +0000 (13:58 +0100)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Mon, 29 Jul 2013 12:58:12 +0000 (13:58 +0100)
commit00a2b15acef8866a404db64381d7dfeb93bf7ad9
treec93f2b1ee0ecc5bc0388884be4eaa39a6d54b15b
parent46419ca632a15de10fda41831d5a738a3313d662
parent99c8e29207a787fd85c22cb05ff89271b8097091
merge JABAWS_Release_2_1 into develop
conf/settings/AAConParameters.xml