From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 13 Nov 2012 17:49:01 +0000 (+0000)
Subject: Merge branch 'master' into develop
X-Git-Tag: Jalview_2_9~267
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fc1071bf1a0ffd7ae13006ddaa2f82a63b35abcd;p=jalview.git

Merge branch 'master' into develop
---

fc1071bf1a0ffd7ae13006ddaa2f82a63b35abcd