Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 6 Nov 2014 08:53:55 +0000 (08:53 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 6 Nov 2014 08:53:55 +0000 (08:53 +0000)

Trivial merge