Merge branch 'MDL-40996' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:08:15 +0000 (09:08 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:08:15 +0000 (09:08 +1200)

Trivial merge