Merge "Ensure that User::getId() returns int"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 23 Mar 2016 14:58:51 +0000 (14:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 23 Mar 2016 14:58:51 +0000 (14:58 +0000)
1  2 
includes/user/User.php

Simple merge