Merge branch 'master' of ssh://digit.mahou.co.uk/home/kirinji/repos/xestiacal

diff --combined source/tests/xestiacalendar_testcommon.h
index 739bd64,ab30396..363b9b8
--- 1/source/tests/xestiacalendar_testcommon.h
--- 2/source/tests/xestiacalendar_testcommon.h
+++ b/source/tests/xestiacalendar_testcommon.h
@@@ -3,7 -3,6 +3,7 @@@
  
  #include "../objects/CalDAV/CalDAV.h"
  #include <string>
 +#include <stdexcept>
  
  using namespace std;
  
@@@ -11,7 -10,8 +11,8 @@@ enum ProcessConnectionDataFileResult
        PROCESSCONNECTIONDATAFILE_UNITTESTFAIL = -1,
        PROCESSCONNECTIONDATAFILE_OK,
        PROCESSCONNECTIONDATAFILE_MISSING,
-       PROCESSCONNECTIONDATAFILE_CANNOTOPEN
+       PROCESSCONNECTIONDATAFILE_CANNOTOPEN,
+       PROCESSCONNECTIONDATAFILE_INVALID
  };
  
  ProcessConnectionDataFileResult ProcessConnectionDataFile(string DataFilename,