2009-04-25 - production
05:30	<Tim-away>	fixed conflict markers in extensions/CentralNotice/SpecialNoticeText.php and resynced.	[production]