Merge branch '43349-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Jan 2014 06:21:44 +0000 (14:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Jan 2014 06:21:44 +0000 (14:21 +0800)

Trivial merge