Merge "(bug 16020) Fix race condition in User::addToDatabase()"

author Aaron Schulz <aschulz@wikimedia.org>

Wed, 10 Oct 2012 18:08:53 +0000 (18:08 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 10 Oct 2012 18:08:53 +0000 (18:08 +0000)
author Aaron Schulz <aschulz@wikimedia.org>
Wed, 10 Oct 2012 18:08:53 +0000 (18:08 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 10 Oct 2012 18:08:53 +0000 (18:08 +0000)
diff --cc includes/User.php
Simple merge
diff --cc includes/specials/SpecialUserlogin.php
Simple merge
author	Aaron Schulz <aschulz@wikimedia.org>
	Wed, 10 Oct 2012 18:08:53 +0000 (18:08 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 10 Oct 2012 18:08:53 +0000 (18:08 +0000)
		1	2
includes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/SpecialUserlogin.php	patch \|	diff1 \|	diff2 \|	blob \| history