Merge branch 'wip-mdl-44945' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Apr 2014 02:53:56 +0000 (10:53 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Apr 2014 02:53:56 +0000 (10:53 +0800)

Trivial merge