Merge branch 'master' of http://git.roojs.com/app.webkitpdf

author Alan Knowles <alan@roojs.com>

Thu, 25 Aug 2016 06:20:37 +0000 (14:20 +0800)

committer Alan Knowles <alan@roojs.com>

Thu, 25 Aug 2016 06:20:37 +0000 (14:20 +0800)
author Alan Knowles <alan@roojs.com>
Thu, 25 Aug 2016 06:20:37 +0000 (14:20 +0800)
committer Alan Knowles <alan@roojs.com>
Thu, 25 Aug 2016 06:20:37 +0000 (14:20 +0800)
diff --cc BrowserWindow.bjs
Simple merge
diff --cc BrowserWindow.vala
Simple merge
author	Alan Knowles <alan@roojs.com>
	Thu, 25 Aug 2016 06:20:37 +0000 (14:20 +0800)
committer	Alan Knowles <alan@roojs.com>
	Thu, 25 Aug 2016 06:20:37 +0000 (14:20 +0800)
		1	2
BrowserWindow.bjs	patch \|	diff1 \|	diff2 \|	blob \| history
BrowserWindow.vala	patch \|	diff1 \|	diff2 \|	blob \| history