Merge branch 'wip-mdl-44977' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Apr 2014 06:34:58 +0000 (14:34 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Apr 2014 06:34:58 +0000 (14:34 +0800)

Trivial merge