Merge branch 'MDL-42287-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 1 Nov 2013 09:31:17 +0000 (17:31 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 1 Nov 2013 09:31:17 +0000 (17:31 +0800)

Trivial merge