Merge branch 'features/JAL-845splitPaneMergeDevelop' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Mar 2015 15:43:05 +0000 (15:43 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Mar 2015 15:43:05 +0000 (15:43 +0000)

Trivial merge