Merge "Add a Uri class."

author Aaron Schulz <aschulz@wikimedia.org>

Tue, 7 Aug 2012 03:37:30 +0000 (03:37 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 7 Aug 2012 03:37:30 +0000 (03:37 +0000)
author Aaron Schulz <aschulz@wikimedia.org>
Tue, 7 Aug 2012 03:37:30 +0000 (03:37 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Aug 2012 03:37:30 +0000 (03:37 +0000)
diff --cc includes/AutoLoader.php
Simple merge
diff --cc includes/GlobalFunctions.php
Simple merge
author	Aaron Schulz <aschulz@wikimedia.org>
	Tue, 7 Aug 2012 03:37:30 +0000 (03:37 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 7 Aug 2012 03:37:30 +0000 (03:37 +0000)
		1	2
includes/AutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history