2008-06-04  John Stowers  <john.stowers@gmail.com>

	* NEWS: Update NEWS for release.

2008-06-04  John Stowers  <john.stowers@gmail.com>

	* NEWS:
	* conduit/__init__.py:
	* configure.ac: Update version numbers to 0.3.11.1 in preparation for
	brown paper bag release.

2008-06-04  John Stowers  <john.stowers@gmail.com>

	* conduit/SyncSet.py: Dont store the application version in the
	settings.xml file. Store a settings-version variable instead.
	Fixes #536400.

2008-06-03  John Carr  <john.carr@unrouted.co.uk>

	* conduit/modules/FlickrModule/flickrapi/Makefile.am:
	We had missing files. Include them.

2008-06-03  John Carr  <john.carr@unrouted.co.uk>

	* conduit/modules/gdata/Makefile.am:
	* configure.ac:
	Include contacts stuff in our shipped GData.
	Fixes #536485 (Andreas Böttger)

2008-06-02  John Carr  <john.carr@unrouted.co.uk>

	* conduit/modules/SynceModule.py:
	Keep self.objects around longer, so that conflict handling copes
	better.

2008-06-03  John Stowers  <john.stowers@gmail.com>

	* NEWS:
	* conduit/__init__.py:
	* configure.ac: Version bump to 0.3.12