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

Trivial merge