Merge branch 'MDL-51084-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Aug 2015 04:54:49 +0000 (12:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Aug 2015 04:54:49 +0000 (12:54 +0800)
commit5d98022e81f13c79f15813b813ebc3ecf742bee5
tree1b79e808b73c2af902ed96a9d41e001e9335f4b2
parent5e567834dd0cd1a1f76c70f0f6766e7356301b1e
parentbdead9b5c76f6d2b9ccfa4b5f36bd240e0e139ec
Merge branch 'MDL-51084-master' of git://github.com/marinaglancy/moodle