From: David Gow <david@ingeniumdigital.com>
Date: Mon, 25 Aug 2014 08:54:46 +0000 (+0800)
Subject: Merge branch 'master' of git.ucc.asn.au:ipdf/code
X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=commitdiff_plain;h=67fbce330b046b1f0d63222f04d83410dc1b2faa

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

Conflicts:
	src/document.cpp
---

67fbce330b046b1f0d63222f04d83410dc1b2faa