Merge branch 'master' into jquery-ui

blueimp · blueimp · commit 4883dc9c84e2 · 2012-03-21T14:57:52.000+09:00
Conflicts:
	index.html
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * jQuery File Upload Plugin Demo 6.5
+ * jQuery File Upload Plugin Demo 6.5.1
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<!DOCTYPE HTML>`
`2`	`2`	`<!--`
`3`	`3`	`/*`
`4`		`- * jQuery File Upload Plugin Demo 6.5`
	`4`	`+ * jQuery File Upload Plugin Demo 6.5.1`
`5`	`5`	`* https://github.com/blueimp/jQuery-File-Upload`
`6`	`6`	`*`
`7`	`7`	`* Copyright 2010, Sebastian Tschan`