Merge pull request #362 from hannes2000/protected_user_fields

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

Fri, 8 Jun 2012 14:22:05 +0000 (07:22 -0700)

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

Fri, 8 Jun 2012 14:22:05 +0000 (07:22 -0700)
author Matías Aguirre <matiasaguirre@gmail.com>
Fri, 8 Jun 2012 14:22:05 +0000 (07:22 -0700)
committer Matías Aguirre <matiasaguirre@gmail.com>
Fri, 8 Jun 2012 14:22:05 +0000 (07:22 -0700)
diff --cc README.rst
Simple merge
diff --cc doc/configuration.rst
Simple merge
author	Matías Aguirre <matiasaguirre@gmail.com>
	Fri, 8 Jun 2012 14:22:05 +0000 (07:22 -0700)
committer	Matías Aguirre <matiasaguirre@gmail.com>
	Fri, 8 Jun 2012 14:22:05 +0000 (07:22 -0700)
		1	2
README.rst	patch \|	diff1 \|	diff2 \|	blob \| history
doc/configuration.rst	patch \|	diff1 \|	diff2 \|	blob \| history