Merge "Session: Improvements to encryption functionality"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 24 Jul 2016 13:56:29 +0000 (13:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 24 Jul 2016 13:56:29 +0000 (13:56 +0000)

Trivial merge