Merge branch 'w39_MDL-41223_m26_customlogin' of https://github.com/skodak/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 00:54:19 +0000 (10:54 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 00:54:19 +0000 (10:54 +1000)

Trivial merge