Merge "(bug 33471) Changed detection of secure cookies."
authorDemon <chadh@wikimedia.org>
Tue, 14 Aug 2012 23:14:40 +0000 (23:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 14 Aug 2012 23:14:40 +0000 (23:14 +0000)

Trivial merge