Merge branch 'MDL-42869' of https://github.com/danielneis/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 Apr 2014 06:04:38 +0000 (14:04 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 Apr 2014 06:04:38 +0000 (14:04 +0800)

Trivial merge