From: Pat Thoyts Date: Mon, 3 Oct 2016 22:23:19 +0000 (+0100) Subject: Merge branch 'rs/use-modern-git-merge-syntax' into pu X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=9613644a310980beaaafc84f20e55520818b89b0;p=rit Merge branch 'rs/use-modern-git-merge-syntax' into pu --- 9613644a310980beaaafc84f20e55520818b89b0