Merge branch 'master_MDL-33477' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 06:08:36 +0000 (14:08 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 06:08:36 +0000 (14:08 +0800)

Trivial merge