Merge branch 'MDL-40775_master' of git://github.com/grabs/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 05:28:22 +0000 (13:28 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 05:28:22 +0000 (13:28 +0800)

Trivial merge