Added Pornotube support (for Laborers of Love)
Added YouPorn infoExtractor
Removed the README.md build target in the makefile.  It is broken...
Strip HTML out of uploader name
Fixed a problem with the XNXXIE Regex
added YouJizz extractor
Merge branch 'master' of https://github.com/rg3/youtube-dl

Conflicts:
	.gitignore
	LATEST_VERSION
	Makefile
	youtube-dl
	youtube-dl.exe
	youtube_dl/InfoExtractors.py
	youtube_dl/__init__.py
Added extractors for 3 porn sites
Added extractors for 3 porn sites
Merge branch 'master' of https://github.com/jefftimesten/youtube-dl
Merge branch 'master' of https://github.com/jefftimesten/youtube-dl
Merge branch 'master' of https://github.com/jefftimesten/youtube-dl
re-fixed XNXX regex problem
made changes recommended in pull request
oops - didn't remove some reminders
fixed tests (used the --test option) so that they pass.  go figure
Merge pull request #621 from atomizer/master

justin.tv tweaks
release 2013.01.08
Fix broken ffmpeg (Closes #623)
Support --audio-format=opus