Merge branch 'develop' into JAL-1640_stylesettings
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 9 Feb 2015 15:30:40 +0000 (15:30 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 9 Feb 2015 15:30:40 +0000 (15:30 +0000)
commit913c7db3eaf97959bcd34a7e96b64632b622edc8
treed6b957607310931b75eca52636aa6ec184f8716d
parent28905890ca861cdfd7defc659faf4bdb823bac0a
parent1004f551e9e11127a137aecdba045c1c75542b92
Merge branch 'develop' into JAL-1640_stylesettings