Merge branch 'MDL-38657_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 08:50:43 +0000 (16:50 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 08:50:43 +0000 (16:50 +0800)

Trivial merge