Merge "Fix encryption code in Session"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 31 May 2016 16:17:32 +0000 (16:17 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 31 May 2016 16:17:32 +0000 (16:17 +0000)

Trivial merge