Merge branch 'rs/use-modern-git-merge-syntax' into pu
authorPat Thoyts <patthoyts@users.sourceforge.net>
Mon, 3 Oct 2016 22:23:19 +0000 (23:23 +0100)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Mon, 3 Oct 2016 22:23:19 +0000 (23:23 +0100)
Trivial merge