Merge branches 'JABAWS_Release_2_1' and 'JABAWS_Release_2_1' of https://source.jalvie...
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 1 Jul 2013 14:14:16 +0000 (15:14 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 1 Jul 2013 14:14:16 +0000 (15:14 +0100)
commit5e7cd807ed94d8e176375f183430ae3977825876
treef0487961160b531ec02ca53659e040949e439fe2
parente16eddf069ddb0356975fab97a2d003f8f1ad4fd
parent65f579f3a0ff4e2626017be25f015ee5c6e39275
Merge branches 'JABAWS_Release_2_1' and 'JABAWS_Release_2_1' of https://source.jalview.org/git/jabaws into JABAWS_Release_2_1

Conflicts:
website/man_about.html
Tweaked the wording a bit more - introduced standard man_about.html#jabaX.Y.Z style name anchor for update history
website/index.html
website/man_about.html
website/manual_qs_amazon.html
website/manual_qs_client.html
website/manual_qs_va.html
website/manual_qs_war.html
website/quick_start.html