Merge branch 'MDL-47889-master' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 28 Oct 2014 09:55:06 +0000 (17:55 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 28 Oct 2014 09:55:06 +0000 (17:55 +0800)
commitb5478757c61f4edb48bcd4da994db8ec7ed7d58a
treef3997f75e5b1bf0aef777026ff04c55abae099c3
parent001652d74317e9fa25ebecef3fecc3061df4dcf5
parentd9e879e5d1ec111519579a4c54306a633f631a3d
Merge branch 'MDL-47889-master' of git://github.com/FMCorz/moodle