Merge branch 'bugs/JAL-1151' into Release_2_8_2_Branch_i18n
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 7 Oct 2014 16:27:50 +0000 (17:27 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 7 Oct 2014 16:27:50 +0000 (17:27 +0100)
commitb3fc31c2a489c37a8e5ae36b0c33e7a29d9af6ad
treea225a6f2c42fdf342abc5dca438c92d64d06fdb2
parentd518f19c8d411d365085962d4ec8dadc78e773f9
parent7e8241cdc284ef2586e36a3abbe3bd385dad10dc
Merge branch 'bugs/JAL-1151' into Release_2_8_2_Branch_i18n