Merge branch 'release-1.5.9' into develop
Merge branch 'release-1.5.9' into preview
Merge branch 'master' into feature/improve-content-11081
Cleans up add-on configuration.
Merge branch 'feature/improve-content-11081' into preview
Merge branch 'feature/improve-content-11081' into develop
Update the license to get ready for 2014.
Add myself to AUTHORS.txt.
format
Removes z3c.autoinclude from setup.py.
Add Etherpad portlet [11085].
Merge branch 'preview' of ssh://redmine.vnc.biz/vnc-plone-content into feature/migrate-etherpad-11085
Adds iframe portlet [11086].
Adds Special RSS Portlet.
Adds users_box portlet.
Merge branch 'feature/migrate-etherpad-11085' into develop
Merge branch 'feature/migrate-portlets-11086-11090' into develop

Conflicts:
	docs/HISTORY.txt
	vnccollab/content/portlets/configure.zcml
	vnccollab/content/profiles/default/portlets.xml
	vnccollab/content/upgrades/configure.zcml
	vnccollab/content/upgrades/upgrades.py
Merge branch 'develop'
vnccollab.content 1.5.10