Merge branch 'w51_MDL-30502_m23_ldapenrol' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 04:24:14 +0000 (17:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 04:24:14 +0000 (17:24 +1300)

Trivial merge