Merge branch 'MDL-45009-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Apr 2014 04:23:57 +0000 (12:23 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Apr 2014 04:23:57 +0000 (12:23 +0800)

Trivial merge