Merge branch 'MDL-52336-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 09:38:15 +0000 (17:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 09:38:15 +0000 (17:38 +0800)
commit0f8673948202e8c73ec131e82a9bda9b50023b06
treecb7f6a16be9d4286429c550e27bc4d53d293d36e
parentea2707f9dc3be772907c8d83becb886dbda4b15e
parentace059fd4c270f01a5abd89b879f30145a7efe13
Merge branch 'MDL-52336-master' of git://github.com/marinaglancy/moodle