Merge branch 'MDL-43595-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Jan 2014 03:34:46 +0000 (11:34 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Jan 2014 03:34:46 +0000 (11:34 +0800)

Trivial merge