Merge branch 'MDL-41889_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:49:29 +0000 (09:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:49:29 +0000 (09:49 +1200)

Trivial merge