Merge branch 'MDL-39005' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 05:49:09 +0000 (13:49 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 05:49:09 +0000 (13:49 +0800)

Trivial merge