Merge branch 'master' of git.ucc.asn.au:ipdf/code

Conflicts:
	src/bezier.cpp
	src/view.h

diff --cc src/bezier.h
Simple merge

diff --cc src/document.cpp
Simple merge

diff --cc src/view.cpp
Simple merge