Merge branch 'MDL-44616_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 16 Apr 2014 20:52:07 +0000 (08:52 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 16 Apr 2014 20:52:07 +0000 (08:52 +1200)

Trivial merge