From: Jim Procter <jprocter@dundee.ac.uk>
Date: Fri, 6 Feb 2015 10:59:33 +0000 (+0000)
Subject: Merge branch 'bug/JAL-1643_File-chooser-improvement' into develop
X-Git-Tag: Jalview_2_9~97
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1004f551e9e11127a137aecdba045c1c75542b92;p=jalview.git

Merge branch 'bug/JAL-1643_File-chooser-improvement' into develop

Conflicts:
	.classpath
---

1004f551e9e11127a137aecdba045c1c75542b92