Merge branch 'MDL-30937_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 11:06:49 +0000 (11:06 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 11:06:49 +0000 (11:06 +0000)

Trivial merge