Merge branch 'dev_from_2_8_1' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 15 Oct 2013 10:23:44 +0000 (11:23 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 15 Oct 2013 10:23:44 +0000 (11:23 +0100)
commitb208437dfce034b96d3c48d9700f67cdd3458e42
tree492a27868553d316262f61363bea745afc53ddb3
parent60f7107d9fc77f34e96ae4b9780e2d11195aed3b
parent21d6c27e237d77ae258755562aa8abdc6b5320b8
Merge branch 'dev_from_2_8_1' into develop