Merge branch 'MDL-48171-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 00:21:02 +0000 (13:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 00:21:02 +0000 (13:21 +1300)

Trivial merge