Merge branch 'dougforpres-auth-retry'
authorSteven Bazyl <sqrrrl@gmail.com>
Wed, 17 Dec 2014 20:40:15 +0000 (12:40 -0800)
committerSteven Bazyl <sqrrrl@gmail.com>
Wed, 17 Dec 2014 20:40:15 +0000 (12:40 -0800)

Trivial merge