Merge branch 'wip-mdl-40044' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Aug 2013 06:27:35 +0000 (14:27 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Aug 2013 06:27:35 +0000 (14:27 +0800)

Trivial merge