Merge branch 'MDL-26017_master' of https://github.com/ndunand/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 01:24:14 +0000 (14:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 01:24:14 +0000 (14:24 +1300)

Trivial merge