Merge branch 'wip-MDL-41317-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Sep 2013 02:40:28 +0000 (10:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Sep 2013 02:40:28 +0000 (10:40 +0800)

Trivial merge