Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 29 Sep 2013 22:55:19 +0000 (11:55 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 29 Sep 2013 22:55:19 +0000 (11:55 +1300)

Trivial merge