Merge branch 'master_MDL-39910' of https://github.com/mayankgupta/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 25 Sep 2013 22:13:01 +0000 (10:13 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 25 Sep 2013 22:13:01 +0000 (10:13 +1200)

Trivial merge