Merge branch 'MDL-36804-master-fix2' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 5 Apr 2013 08:00:35 +0000 (16:00 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 5 Apr 2013 08:00:35 +0000 (16:00 +0800)

Trivial merge