Merge branch 'MDL-39695_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 00:00:59 +0000 (12:00 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 00:00:59 +0000 (12:00 +1200)

Trivial merge