Git commits in Moodle 2.6.x by Shane Elliott

commit 0604e03bf95fe4d33a33e1e2d8a6398107407043
Author: Shane Elliott <shane@pukunui.com>
Date:   Tue, 16 Jul 2013 16:55:12 +0800
Tag:    v2.6.0-beta

MDL-40684 Fix conditional field name for custom user fields