Merge branch 'MDL-44319-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 06:21:28 +0000 (14:21 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 06:21:28 +0000 (14:21 +0800)

Trivial merge