Merge "(bug 18195) Allow changing preferences via API"

author Werdna <agarrett@wikimedia.org>

Fri, 4 May 2012 05:53:05 +0000 (05:53 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 4 May 2012 05:53:06 +0000 (05:53 +0000)
author Werdna <agarrett@wikimedia.org>
Fri, 4 May 2012 05:53:05 +0000 (05:53 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 4 May 2012 05:53:06 +0000 (05:53 +0000)
diff --cc includes/AutoLoader.php
Simple merge
diff --cc includes/User.php
Simple merge
diff --cc includes/api/ApiQueryUserInfo.php
Simple merge
author	Werdna <agarrett@wikimedia.org>
	Fri, 4 May 2012 05:53:05 +0000 (05:53 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 4 May 2012 05:53:06 +0000 (05:53 +0000)
		1	2
includes/AutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiQueryUserInfo.php	patch \|	diff1 \|	diff2 \|	blob \| history