Merge branch 'MDL-52472-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 08:02:46 +0000 (16:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 08:02:46 +0000 (16:02 +0800)
commit588da1653d836872060bc13e7b902ab4d8f5c0ab
tree7573f492c0abec53d5132cd8fa30707f24605c53
parent3e702b5855cd71f741ff057e01ea2ed15846dd32
parentf2f29ea2c73c46fdb7b1b70dc1b08b0a00c560c6
Merge branch 'MDL-52472-master' of git://github.com/danpoltawski/moodle