From: David Levine <david.levine@gonift.com>
Date: Thu, 24 Mar 2016 00:41:46 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin' into xoauth
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/8e0f9bd3daae9d05dec58026d5a5924367e4e874?ds=inline;hp=--cc

Merge remote-tracking branch 'origin' into xoauth

 merge is necessary,
---

8e0f9bd3daae9d05dec58026d5a5924367e4e874