Merge branch 'MDL-39190' of https://github.com/pauln/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 01:19:52 +0000 (14:19 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 01:19:52 +0000 (14:19 +1300)

Trivial merge