Merge branch 'master_MDL-36421' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 01:01:00 +0000 (09:01 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 01:01:00 +0000 (09:01 +0800)

Trivial merge