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

Trivial merge