Merge branch 'wip-MDL-39462-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 May 2013 08:21:42 +0000 (09:21 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 May 2013 08:21:42 +0000 (09:21 +0100)

Trivial merge