RSS Fixes
fixes for expiry processing
#604

This moves the expiry date to the same line. Maybe a better solution
could be made. It certainly looks better for the expiry to be beneath
the publish date.
Merge remote-tracking branch 'origin/master' into 1.4.6

Conflicts:
	zp-core/zp-extensions/rss.php

	modified:   zp-core/class-feed.php
	modified:   zp-core/zp-extensions/rss.php
	modified:   zp-core/zp-extensions/zenpage/zenpage-admin-functions.php
	modified:   zp-core/zp-extensions/zenpage/zenpage-class.php
	modified:   zp-core/zp-extensions/zenpage/zenpage-template-functions.php