From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 23 Jul 2015 12:15:59 +0000 (+0100)
Subject: Merge branch 'task/JAL-1794_jettyExamplesServer' into develop
X-Git-Tag: Release_2_10_0~564
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1ba1e0a85c35c0ae6ff487d76f506ec3a4c01778;p=jalview.git

Merge branch 'task/JAL-1794_jettyExamplesServer' into develop
---

1ba1e0a85c35c0ae6ff487d76f506ec3a4c01778