Merge branch 'MDL-38933-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 03:09:05 +0000 (11:09 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 03:09:05 +0000 (11:09 +0800)

Trivial merge