Merge branch 'MDL-37600' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 08:49:58 +0000 (16:49 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 08:49:58 +0000 (16:49 +0800)

Trivial merge