Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 4 Dec 2013 06:57:24 +0000 (14:57 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Dec 2013 06:57:24 +0000 (14:57 +0800)

Trivial merge