Merge branch 'wip_master_mdl-32724' of https://github.com/iarenaza/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Feb 2014 02:26:05 +0000 (15:26 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Feb 2014 02:26:05 +0000 (15:26 +1300)

Trivial merge