Merge branch 'MDL-43693-master' of https://github.com/lucisgit/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 03:21:52 +0000 (11:21 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 03:21:52 +0000 (11:21 +0800)

Trivial merge