Merge remote branch 'bigfix/master'

jzaefferer · jzaefferer · commit e5a9e4315675 · 2010-10-28T16:09:41.000+02:00
Conflicts:
	META.json
	jquery.metadata.js
diff --git a/META.json b/META.json
@@ -3,7 +3,7 @@
 	"version": 2.0,
 	"author": [
 		"John Resig <jeresig@gmail.com>",
-		"J�rn Zaefferer <joern.zaefferer@gmail.com>",
+		"Jörn Zaefferer <joern.zaefferer@gmail.com>",
 		"Paul McLanahan <pmclanahan@gmail.com>"
 	],
 	"abstract": "Quietly extract JSON metadata contained within DOM elements.",
diff --git a/jquery.metadata.js b/jquery.metadata.js
@@ -1,14 +1,12 @@
 /*
  * Metadata - jQuery plugin for parsing metadata from elements
  *
- * Copyright (c) 2006 John Resig, Yehuda Katz, J�örn Zaefferer, Paul McLanahan
+ * Copyright (c) 2006 John Resig, Yehuda Katz, Jörn Zaefferer, Paul McLanahan
  *
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
  *
- * Revision: $Id: jquery.metadata.js 4187 2007-12-16 17:15:27Z joern.zaefferer $
- *
  */
 
 /**

-Original file line number
+Diff line change
 	"version": 2.0,
 	"author": [
 		"John Resig <[email protected]>",
 -		"Jörn Zaefferer <[email protected]>",
 +		"Jörn Zaefferer <[email protected]>",
 		"Paul McLanahan <[email protected]>"
 	],
 	"abstract": "Quietly extract JSON metadata contained within DOM elements.",
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,12 @@`
`1`	`1`	`/*`
`2`	`2`	`* Metadata - jQuery plugin for parsing metadata from elements`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2006 John Resig, Yehuda Katz, J�örn Zaefferer, Paul McLanahan`
	`4`	`+ * Copyright (c) 2006 John Resig, Yehuda Katz, Jörn Zaefferer, Paul McLanahan`
`5`	`5`	`*`
`6`	`6`	`* Dual licensed under the MIT and GPL licenses:`
`7`	`7`	`* http://www.opensource.org/licenses/mit-license.php`
`8`	`8`	`* http://www.gnu.org/licenses/gpl.html`
`9`	`9`	`*`
`10`		`- * Revision: $Id: jquery.metadata.js 4187 2007-12-16 17:15:27Z joern.zaefferer $`
`11`		`- *`
`12`	`10`	`*/`
`13`	`11`
`14`	`12`	`/**`