From: Ian Kelling <ian@iankelling.org>
Date: Sun, 16 Apr 2017 00:41:54 +0000 (-0700)
Subject: Merge independent repo conflink into this one
X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=commitdiff_plain;h=f3e6a97425746ed185c28dcc03acf7e67a6af560

Merge independent repo conflink into this one

Merge remote-tracking branch 'conflink/master'
---

f3e6a97425746ed185c28dcc03acf7e67a6af560