From: David Gow <david@ingeniumdigital.com>
Date: Fri, 23 May 2014 04:05:30 +0000 (+0800)
Subject: Merge branch 'master' (sigh) of git.ucc.asn.au:ipdf/documents
X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fdocuments.git;a=commitdiff_plain;h=7405135393cd483690c441d40db21f5172b8a16f;hp=7405135393cd483690c441d40db21f5172b8a16f

Merge branch 'master' (sigh) of git.ucc.asn.au:ipdf/documents

Conflicts:
	papers.bib
---