Merge branch 'MDL-51215-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Aug 2015 02:45:19 +0000 (10:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Aug 2015 02:45:19 +0000 (10:45 +0800)
commitabbf64e363debfe7809214ecc108313b6753613b
tree656904422ddfe4ce4b49c7c7986d7e6bd4003a53
parentf75afe9b90cd3e6f08239b20761e3bcf831d7394
parentefbd56960cd6758d7a046bf51244eecf29d89300
Merge branch 'MDL-51215-master' of git://github.com/marinaglancy/moodle