Merge branch 'master_MDL-45712' of git://github.com/danmarsden/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 03:14:09 +0000 (11:14 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 03:14:09 +0000 (11:14 +0800)
commit5303fb94ef2f2921b665614876c662e4e8be2723
treebc6a44346718be61207bdc29c2516c540e18789c
parent58920c8e5362f246fa4a920295fcedf06da30d45
parent3ef6e4608159d54b5cb488c49f1f0fc4249093fd
Merge branch 'master_MDL-45712' of git://github.com/danmarsden/moodle