From: David Levine <david.levine@gonift.com>
Date: Fri, 8 Jul 2016 14:48:59 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin' into xoauth
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/2e04b8ea0e57e411665aa6a8814ff65db0d4cd2b?hp=2e04b8ea0e57e411665aa6a8814ff65db0d4cd2b

Merge remote-tracking branch 'origin' into xoauth
---