Merge branch 'MDL-40852_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:10:28 +0000 (09:10 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:10:28 +0000 (09:10 +1200)

Trivial merge