Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Apr 2014 09:28:34 +0000 (17:28 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Apr 2014 09:28:34 +0000 (17:28 +0800)

Trivial merge