Merge branch 'patches' into pu
commit408c2120e02cf2a96cd44c69fe3baf406d4de157
authorPat Thoyts <patthoyts@users.sourceforge.net>
Mon, 3 Oct 2016 22:28:57 +0000 (3 23:28 +0100)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Mon, 3 Oct 2016 22:28:57 +0000 (3 23:28 +0100)
tree39bbc79808622e6aa3a16f0437e2bc2b39881ec7
parent64c6b4c507c0295dbd54b0981510a5a8fff71947
parenta0a0c6838744ce51bcbb634f459e173e8be59c22
Merge branch 'patches' into pu