Merge branch 'MDL-42219-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 Oct 2013 04:39:37 +0000 (12:39 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 Oct 2013 04:39:37 +0000 (12:39 +0800)

Trivial merge