From: hansonr <hansonr@stolaf.edu>
Date: Fri, 24 Jul 2015 12:13:26 +0000 (+0100)
Subject: Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git
X-Git-Url: http://source.jalview.org/gitweb/?p=jalviewjs.git;a=commitdiff_plain;h=b9b7a352eee79b7764c3b09c9d19663075061d8c;hp=b9b7a352eee79b7764c3b09c9d19663075061d8c

Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git

Conflicts:
	src/fr/orsay/lri/varna/models/rna/RNA.java
---