Merge branch 'wip-mdl-43437' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 19 Dec 2013 02:56:41 +0000 (10:56 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 19 Dec 2013 02:56:41 +0000 (10:56 +0800)

Trivial merge