Merge "Oracle: DRCP and persistent connections support"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Wed, 29 May 2013 19:58:53 +0000 (19:58 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 29 May 2013 19:58:53 +0000 (19:58 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 29 May 2013 19:58:53 +0000 (19:58 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 29 May 2013 19:58:53 +0000 (19:58 +0000)
diff --cc RELEASE-NOTES-1.22
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 29 May 2013 19:58:53 +0000 (19:58 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 29 May 2013 19:58:53 +0000 (19:58 +0000)
		1	2
RELEASE-NOTES-1.22	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history