Issue #20: Merge branch 'daniel' into 'development'

Discard Daniel's work from 2012 in favour of the recent work on the
'development' branch which achieves the same thing in more or less the
same fashion, and was informed by the work on his branch.
This commit is contained in:
Andrew Bettison 2013-09-19 17:56:16 +09:30
commit 17347dbe3f

Diff Content Not Available