Merge branch 'patch/JAL-1286_JAL-1265' into Release_2_8_2_Branch
authorJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 15:18:42 +0000 (16:18 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 15:18:42 +0000 (16:18 +0100)
commitdeff1a0f2a6dbcf087b4f6541e2fc7284a382b66
tree67715d39df3a11dd586e9b6e77aeea7900dd7931
parent911c6630cec6fa5253821a7e18a13d0d4df3627c
parent2b932938908d5417b6c4ac121fa18ccc0836b72a
Merge branch 'patch/JAL-1286_JAL-1265' into Release_2_8_2_Branch