Merge remote branch 'upstream/master'

author Vivien Nicolas <21@vingtetun.org>

Fri, 26 Aug 2011 15:19:53 +0000 (17:19 +0200)

committer Vivien Nicolas <21@vingtetun.org>

Fri, 26 Aug 2011 15:19:53 +0000 (17:19 +0200)
author Vivien Nicolas <21@vingtetun.org>
Fri, 26 Aug 2011 15:19:53 +0000 (17:19 +0200)
committer Vivien Nicolas <21@vingtetun.org>
Fri, 26 Aug 2011 15:19:53 +0000 (17:19 +0200)
diff --cc fonts.js
Simple merge
diff --cc pdf.js
Simple merge
author	Vivien Nicolas <21@vingtetun.org>
	Fri, 26 Aug 2011 15:19:53 +0000 (17:19 +0200)
committer	Vivien Nicolas <21@vingtetun.org>
	Fri, 26 Aug 2011 15:19:53 +0000 (17:19 +0200)
		1	2
fonts.js	patch \|	diff1 \|	diff2 \|	blob \| history
pdf.js	patch \|	diff1 \|	diff2 \|	blob \| history