Merge branch 'MDL-49807-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 07:11:09 +0000 (15:11 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 07:11:09 +0000 (15:11 +0800)
commit6cc1c062366fe51814eb936fb0868965834aa71d
treee7300f9d6cd0aaa94172b8d8f0fafdf75c2b0aed
parent3738d1b60bad00444816cbcda39d895031462eee
parent3d89ccb37460223a891aa355cd2ec5ff26289b4b
Merge branch 'MDL-49807-master' of git://github.com/marinaglancy/moodle