Merge pull request #3616 from tamland/cookiefix
authorTrent Nelson <trent.a.b.nelson@gmail.com>
Sun, 10 Nov 2013 18:37:42 +0000 (10:37 -0800)
committerTrent Nelson <trent.a.b.nelson@gmail.com>
Sun, 10 Nov 2013 18:37:42 +0000 (10:37 -0800)
fix infinite loop


Trivial merge