Merge branch 'JAL-1587_promotedisorder' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 18 Nov 2014 09:56:53 +0000 (09:56 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 18 Nov 2014 09:56:53 +0000 (09:56 +0000)

Trivial merge