Merge branch 'bug/JAL-1443_loading-empty-file' into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 2 Jul 2015 15:38:40 +0000 (16:38 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 2 Jul 2015 15:38:40 +0000 (16:38 +0100)
commit4f6267811207426a9670a89c875e74a634e544e9
treec31dac336df57b8e790e3b1bd191b07f8992471a
parent946d983b176eeda08ae0af13aff6cd1c9e017806
parent58399507cc82e8c7940a8500af73c3ed1bdd720d
Merge branch 'bug/JAL-1443_loading-empty-file' into develop