Merge branch 'MDL-42290-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Oct 2013 06:36:07 +0000 (14:36 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Oct 2013 06:36:07 +0000 (14:36 +0800)

Trivial merge