Merge branch 'MDL-38825' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 03:49:24 +0000 (11:49 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 03:49:24 +0000 (11:49 +0800)

Trivial merge