Merge "Use 'email' instead of 'e-mail' in API texts."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 3 Mar 2013 00:42:48 +0000 (00:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 3 Mar 2013 00:42:48 +0000 (00:42 +0000)
1  2 
includes/api/ApiBase.php

Simple merge