Merge branch 'MDL-42273-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 15:40:33 +0000 (23:40 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 15:40:33 +0000 (23:40 +0800)

Trivial merge