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

Trivial merge