Merge branch 'MDL-45432-master' of https://github.com/lucisgit/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 May 2014 10:43:15 +0000 (18:43 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 19 May 2014 10:43:15 +0000 (18:43 +0800)

Trivial merge