Merge branch 'MDL-51702_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jan 2016 10:30:04 +0000 (10:30 +0000)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:18 +0000 (10:15 +0800)
commit1d1c8f6275a55ab6ebc0be05c6dc0e48f338ce26
treee6bc78fe58ea44fe3e88e43f6e2d523ee09d6ffb
parent760b0a17f1e79ed542fc903e31780aebca286403
parentc35cf9bfcdd5a1eb7d852d4f4f6049028e3debbb
Merge branch 'MDL-51702_master' of git://github.com/dmonllao/moodle