Merge branch 'MDL-40315_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 23:14:14 +0000 (11:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 23:14:14 +0000 (11:14 +1200)

Trivial merge