From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Mon, 17 Jun 2013 17:26:54 +0000 (+0100)
Subject: Merge branch 'JAL-1319_jronn_npe' into develop
X-Git-Tag: Jalview_2_9~239
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=64cdefaf67fa9b1816fd37747b50161707057c5e;p=jalview.git

Merge branch 'JAL-1319_jronn_npe' into develop
---

64cdefaf67fa9b1816fd37747b50161707057c5e