BFN

Conflicts:
	horde/docs/CHANGES
	horde/package.xml