From: Sam Moore <matches@ucc.asn.au>
Date: Wed, 26 Mar 2014 16:27:44 +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=0d33eac5144178de754ad9f53e39463f79a31398;hp=0d33eac5144178de754ad9f53e39463f79a31398

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

Conflicts:
	src/main.cpp

Fixed that and also fixed other things.
---