Merge branch 'MDL-43838_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 22:27:00 +0000 (11:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 22:27:00 +0000 (11:27 +1300)

Trivial merge