Merge branch 'wip-MDL-45148-master' of https://github.com/mackensen/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Apr 2014 06:22:17 +0000 (14:22 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Apr 2014 06:22:17 +0000 (14:22 +0800)

Trivial merge