Merge branch 'master' of https://github.com/jefftimesten/youtube-dl

author Jeff Crouse <jefftimesten@gmail.com>

Sat, 5 Jan 2013 20:59:28 +0000 (15:59 -0500)

committer Jeff Crouse <jefftimesten@gmail.com>

Sat, 5 Jan 2013 21:00:50 +0000 (16:00 -0500)
author Jeff Crouse <jefftimesten@gmail.com>
Sat, 5 Jan 2013 20:59:28 +0000 (15:59 -0500)
committer Jeff Crouse <jefftimesten@gmail.com>
Sat, 5 Jan 2013 21:00:50 +0000 (16:00 -0500)
diff --cc LATEST_VERSION

index 275de03d947758f5c9b002a6c63c1d4576dacd90,d070c6ea3d7655cfbbddea4fe127fc48fd5b9ecd..275de03d947758f5c9b002a6c63c1d4576dacd90

mode 100755,100644..100644
--- 1/LATEST_VERSION
--- 2/LATEST_VERSION
+++ b/LATEST_VERSION
diff --cc README.md

index b3cd9a38cfdfb1eb51ca44e24a53568ff7fd5fae,4b0de1b8894d6871e4c32099fbfe3f7381856234..b3cd9a38cfdfb1eb51ca44e24a53568ff7fd5fae

mode 100755,100644..100644
--- 1/README.md
--- 2/README.md
+++ b/README.md
author	Jeff Crouse <jefftimesten@gmail.com>
	Sat, 5 Jan 2013 20:59:28 +0000 (15:59 -0500)
committer	Jeff Crouse <jefftimesten@gmail.com>
	Sat, 5 Jan 2013 21:00:50 +0000 (16:00 -0500)
		1	2
LATEST_VERSION	patch \|	diff1 \|	diff2 \|	blob \| history
README.md	patch \|	diff1 \|	diff2 \|	blob \| history