Merge branch 'develop' into menard
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 17 Aug 2012 12:13:56 +0000 (13:13 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 17 Aug 2012 12:13:56 +0000 (13:13 +0100)
commit95d969f44184d5445655e07e335256539b36c3a2
tree3c8e8440b231efb34ef6acedd8c6451653bb17a8
parenta16c37a5983e3c581dc3d3030e1439e8fb3239f1
parentead7c435d61624a226f459a0fca90fc24e94caa9
Merge branch 'develop' into menard

Conflicts:
src/jalview/ws/jws2/AAConsClient.java
 (preferred develop)