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)
commit9613644...310980beaaafc84f20e55520818b89b0
treea220faf...b38aa54b55702d5002a91345b7566dd7copy hash to clipboard (tree)
parent34fe0a7...41399811df33e9e64d51707b5fa9579bcopy hash to clipboard (diff)
parentb5f325c...4a0d986689177857a62007027a532d31copy hash to clipboard (diff)