Merge branch 'MDL-43415-master' of git://github.com/zbdd/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 05:16:39 +0000 (13:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 05:16:39 +0000 (13:16 +0800)
commit77b0238bdbb42aa72a2a46b842a55948fc00499c
tree9e60928869466fbc9cf043356e1487860b6cccaf
parentbbc009f26c3d3460a1dd2fc41abff43613cf762a
parenta6fe447a9ae465d59aaba0e57d9551fd58bbbfd5
Merge branch 'MDL-43415-master' of git://github.com/zbdd/moodle