Merge branch 'MDL-35995-master' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Mar 2015 08:33:02 +0000 (08:33 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Mar 2015 08:33:02 +0000 (08:33 +0000)

Trivial merge