Merge branch 'MDL-45430-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Dec 2014 21:22:03 +0000 (21:22 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Dec 2014 21:22:03 +0000 (21:22 +0000)

Trivial merge