Merge branch 'MDL-55873-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Sep 2016 03:55:51 +0000 (11:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Sep 2016 03:55:51 +0000 (11:55 +0800)
commit1e4233434b0cb930e803afa40d341e055e0a7fc0
tree00d8b71304d6e3ac82af198d1cfbfce73b8cbfb2
parentddd6bea1c7680764e0614cbc139c2e9c8edf5350
parent90d8bf59e79b50a511a89c9bfbb5b23c0abf5be9
Merge branch 'MDL-55873-master' of git://github.com/lameze/moodle