Merge branch 'MDL-45145_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Apr 2014 02:51:38 +0000 (10:51 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Apr 2014 02:51:38 +0000 (10:51 +0800)

Trivial merge