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)
commitdbad2a65ec2f128360ac10b27b302afb526eb033
tree75d3dc23c45c9af94688aa60a5c35b02d6363031
parent75c7c412831707ca2b15e93f1d5ae69e429f2e82
parent4cf6e8b71da3c919d13dc762419585534cddac25
Merge branch 'w39_MDL-41223_m26_customlogin' of https://github.com/skodak/moodle