Support for Windows paths in JSON data containing double backslashes
Merge branch 'master' of https://github.com/swiharta/django-fixturemedia

Conflicts:
	setup.py