iglocska 324418dcf9 Merge branch 'master' into 2.4-beta ... Merge and upgrade of several new features Conflicts: VERSION.json app/Controller/ShadowAttributesController.php app/Controller/TagsController.php app/Model/AppModel.php app/Model/Event.php app/Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php		2015-11-08 23:26:19 +01:00
..
SysLogLogableBehavior.php	Merge branch 'master' into 2.4-beta	2015-11-08 23:26:19 +01:00