Merge branch 'MDL-39080_master' of git://github.com/kordan/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Apr 2013 11:44:42 +0000 (12:44 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Apr 2013 11:44:42 +0000 (12:44 +0100)

Trivial merge