Merge branch 'MDL-43930-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 03:22:35 +0000 (11:22 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 03:22:35 +0000 (11:22 +0800)

Trivial merge