Merge branch 'master' of http://source.jalview.org/git/cc-branches
authorJalview build Manager <jalview-dev@jalview.org>
Tue, 3 Sep 2013 11:09:56 +0000 (12:09 +0100)
committerJalview build Manager <jalview-dev@jalview.org>
Tue, 3 Sep 2013 11:09:56 +0000 (12:09 +0100)

Trivial merge