Merge branch 'features/JAL-1152annotationSorting' into features/typed_annotations_calcId
authorJim Procter <jprocter@dundee.ac.uk>
Thu, 6 Nov 2014 17:18:44 +0000 (17:18 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Thu, 6 Nov 2014 17:18:44 +0000 (17:18 +0000)

Trivial merge