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

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

aaf70a50e13231ba06df17d79147ac0d7fed6d91