Merge branch 'wip_MDL-46449_m28_loginblock' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 01:25:13 +0000 (13:25 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 01:25:13 +0000 (13:25 +1200)

Trivial merge