Merge branch 'wip-MDL-36968-int' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 05:16:40 +0000 (13:16 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 05:16:40 +0000 (13:16 +0800)

Trivial merge