Merge branch 'wip-mdl-48290' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Dec 2014 10:41:37 +0000 (10:41 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:04:11 +0000 (12:04 +0000)

Trivial merge