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

Trivial merge