Updated changelog.
Set release date.
Set release date.
Merge branch 'master' of github.com:fruux/sabre-vobject
Merge branch '2.1'

Conflicts:
	ChangeLog