Merge branch 'master' of http://git.roojs.com:8081/Pman.Core

diff --cc DataObjects/core.sql
index 4ea894f,d289195..47d8fe7
--- 1/DataObjects/core.sql
--- 2/DataObjects/core.sql
+++ b/DataObjects/core.sql
@@@ -324,10 -324,8 +324,10 @@@ CREATE TABLE  core_notify  
    PRIMARY KEY (`id`),
    INDEX `lookup`(`act_when`, `msgid`)
  );
 +ALTER TABLE core_notify CHANGE COLUMN bounced event_id INT(11) DEFAULT 0;
 +
  
- 
+ ALTER TABLE core_notify CHANGE COLUMN bounced event_id INT(11) NOT NULL DEFAULT 0;
   
  
  # - used by email / tracker to handle alises - we have to be carefull adding to this table...