From: Jim Procter <jprocter@dundee.ac.uk>
Date: Sun, 23 Nov 2014 20:10:19 +0000 (+0000)
Subject: Merge branch 'JAL-1569_wuss_vienna_broke' into develop
X-Git-Tag: Jalview_2_9~148
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=99ece0eec17dfa6afa515adb441f280a2fcf26cc;p=jalview.git

Merge branch 'JAL-1569_wuss_vienna_broke' into develop
---

99ece0eec17dfa6afa515adb441f280a2fcf26cc