Merge branch 'MDL-47127-master' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 08:41:28 +0000 (16:41 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 08:41:28 +0000 (16:41 +0800)

Trivial merge