Git commits in Moodle 2.5.x by Shane Elliott

commit c794ad68c8280e780c5348cb1732e45f77715ee0
Author: Shane Elliott <shane@pukunui.com>
Date:   Tue, 16 Jul 2013 16:55:12 +0800
Tag:    v2.5.2

MDL-40684 Fix conditional field name for custom user fields