Merge branch 'w50_MDL-31625_m27_replace' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 21:50:07 +0000 (10:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 21:50:07 +0000 (10:50 +1300)

Trivial merge