Correct Gateway class so that it uses the user defined timeout variable, not 1
Merge branch 'integration' of git://github.com/symphonycms/symphony-2
Merge pull request #1716 from designermonkey/2.3.3bugfix

Regex fix for DS filter operation. RE: #1715
Merge pull request #1708 from designermonkey/authors

Fixes for new Author type and access. RE: #1692
Merge pull request #1713 from designermonkey/delegates

Add new delegate into contentPublish, AdjustPublishFiltering. Closes #1712
Merge branch 'integration' of git://github.com/symphonycms/symphony-2 into integration
Allow Providers to work on PHP5.2 (temporary 2.3.x fix). Closes #1709
Fix incorrect assignment in Notify