Merge branch 'MDL-40008_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 06:25:03 +0000 (14:25 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 06:25:03 +0000 (14:25 +0800)

Trivial merge