Merge branch 'MDL-38161' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Feb 2013 02:40:51 +0000 (10:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Feb 2013 02:40:51 +0000 (10:40 +0800)

Trivial merge