tree 4f1784b81afe88a6240889961b5fc3d2b0d6a82e
parent 0d05f8de79ee91e9be80c6296eff9ce216582ba4
parent 201e1ff5bf2054fcb1c0cc3cd7ba1e229dbde3fa
author Jonathan Beck <jonabeck@gmail.com> 1237236033 +0100
committer Jonathan Beck <jonabeck@gmail.com> 1237236033 +0100

Merge branch 'master' into contact_sync

Conflicts:

	configure.ac
	dev/Makefile.am
	include/libiphone/libiphone.h
	src/AFC.c
	src/AFC.h
	src/Makefile.am