Merge branch 'patch_sjf4j_typo' into develop
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 14:25:15 +0000 (15:25 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 14:25:15 +0000 (15:25 +0100)
commit2976d160e93fadf8b282fdc8a40ae0b63ab1d32b
treefd80f648022334651d1964185382fe3eb90300f3
parent5efa5871d51fbfb994b12f8f1575da6f4c860d54
parenta8bfa6ddf1a98943c6e9262322ac910b73ebc5f8
Merge branch 'patch_sjf4j_typo' into develop