Merge branch 'MDL-37506' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Jan 2013 00:54:32 +0000 (08:54 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Jan 2013 00:54:32 +0000 (08:54 +0800)

Trivial merge