Merge branch 'MDL-39806_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 May 2013 06:36:46 +0000 (14:36 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 27 May 2013 06:36:46 +0000 (14:36 +0800)

Trivial merge