Merge branch 'wip-mdl-41418' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 4 Sep 2013 02:38:10 +0000 (10:38 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Sep 2013 02:38:10 +0000 (10:38 +0800)

Trivial merge