Merge branch 'MDL-42293-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 24 Oct 2013 02:27:23 +0000 (10:27 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 24 Oct 2013 02:27:23 +0000 (10:27 +0800)

Trivial merge