Merge branch 'patch_sjf4j_typo' into develop
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 15:54:58 +0000 (16:54 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 15:54:58 +0000 (16:54 +0100)
commit7444d43c91d34d8d3d6c37b0ab634af697ce36a2
tree0b950c808de92067dadf7525ae7f874b76c7d746
parent2976d160e93fadf8b282fdc8a40ae0b63ab1d32b
parentd1d1ca77ce184928fc3b5a1a80e056f867fae73e
Merge branch 'patch_sjf4j_typo' into develop