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

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

b9e0388a118e84f002ae0da6c7a31bdbd89a73bb