Merge branch 'MDL-41248' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 04:39:53 +0000 (12:39 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 04:39:53 +0000 (12:39 +0800)

Trivial merge