Merge branch 'encodings'

Conflicts:
	vdirsyncer/storage/dav.py