Merge pull request #206 from stephenmcd/race-condition-in-backend-loading

author Matías Aguirre <matiasaguirre@gmail.com>

Wed, 28 Dec 2011 14:39:15 +0000 (06:39 -0800)

committer Matías Aguirre <matiasaguirre@gmail.com>

Wed, 28 Dec 2011 14:39:15 +0000 (06:39 -0800)
author Matías Aguirre <matiasaguirre@gmail.com>
Wed, 28 Dec 2011 14:39:15 +0000 (06:39 -0800)
committer Matías Aguirre <matiasaguirre@gmail.com>
Wed, 28 Dec 2011 14:39:15 +0000 (06:39 -0800)
diff --cc README.rst
Simple merge
diff --cc doc/configuration.rst
Simple merge
author	Matías Aguirre <matiasaguirre@gmail.com>
	Wed, 28 Dec 2011 14:39:15 +0000 (06:39 -0800)
committer	Matías Aguirre <matiasaguirre@gmail.com>
	Wed, 28 Dec 2011 14:39:15 +0000 (06:39 -0800)
		1	2
README.rst	patch \|	diff1 \|	diff2 \|	blob \| history
doc/configuration.rst	patch \|	diff1 \|	diff2 \|	blob \| history