Merge branch 'MDL-42181' of git://github.com/mkassaei/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Nov 2013 02:04:59 +0000 (10:04 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Nov 2013 02:04:59 +0000 (10:04 +0800)

Trivial merge