Merge branch 'MDL-44535-master-v2' of https://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Mar 2014 23:51:14 +0000 (12:51 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Mar 2014 23:51:14 +0000 (12:51 +1300)

Trivial merge