Merge branch 'MDL-43235_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 17 Dec 2013 22:19:34 +0000 (11:19 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 17 Dec 2013 22:19:34 +0000 (11:19 +1300)

Trivial merge