Merge branch 'MDL-40039-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Jul 2013 06:27:49 +0000 (14:27 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Jul 2013 06:27:49 +0000 (14:27 +0800)

Trivial merge