Merge branch 'MDL-49473-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Nov 2015 07:12:30 +0000 (15:12 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Nov 2015 07:12:30 +0000 (15:12 +0800)
commita2bb9b875145581ec3933d74c8e10b59f9cee5f0
tree8b8e1b8269deab7b284508225e47c1e5e98e93f4
parent814809d59ee83a25117e777f647fcea609b53e86
parent72ae4ec8d46076a643a4882c63faf049e1a659fe
Merge branch 'MDL-49473-master' of git://github.com/danpoltawski/moodle