Merge branch 'MDL-42138-master' of git://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Feb 2015 09:18:33 +0000 (17:18 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Feb 2015 09:18:33 +0000 (17:18 +0800)
commit1a4764b2f0d6302309f8204d3ffb38236bd9b1c2
tree5152d198fcda28eaa68fe30a0116c527526d6513
parenta6cbafb76481207836601a42a24a6da5cfe34595
parent8ef7eade796ba928f63c5d09a5a4c575cd84d008
Merge branch 'MDL-42138-master' of git://github.com/xow/moodle