Merge branch 'MDL-48937-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 03:41:42 +0000 (11:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 03:41:42 +0000 (11:41 +0800)
commit4c75cc32783063db33d567d3d9f4e4860ef99d52
tree161e3050cf856adfc5f85bd13139c3496d7f90c6
parent4b408c3afef44f9d00a88953b04a056e1870ff83
parentdc3b93cb6f44cd5937085f9796ebd77ec2d0a768
Merge branch 'MDL-48937-master' of git://github.com/FMCorz/moodle