Merge "Add support for mulitpart mime email to email sending code"
authorTychay <tchay@wikimedia.org>
Tue, 8 Jan 2013 23:32:11 +0000 (23:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 8 Jan 2013 23:32:11 +0000 (23:32 +0000)
1  2 
includes/DefaultSettings.php
languages/messages/MessagesEn.php

Simple merge
Simple merge