Merge branch 'MDL-49029_m32v2' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 13:50:29 +0000 (15:50 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 13:50:29 +0000 (15:50 +0200)
commit27600832aaaa5b1d722262540b09e3e0bc77aa8f
tree0cc1c694f6a74af86b8d118ecf1648668c5d5463
parent8846f9950f666f709d6ed7a504ec2060ac743798
parent1725216aee2c308bbbad8ac3d171a86c76b1f711
Merge branch 'MDL-49029_m32v2' of https://github.com/sbourget/moodle