Merge branch 'MDL-54040_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 9 May 2016 09:29:25 +0000 (10:29 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 9 May 2016 09:29:25 +0000 (10:29 +0100)
commit8ab776ef698f15233bc32fb64b96771a15f9491a
tree9c5a358a7251d552592adc368bf7fd5434b25781
parentbbdef8886f358dd8f1a88cd6d1cc85ccb583f358
parent2e1dff9f981b548a6686062c62220e873f288f16
Merge branch 'MDL-54040_master' of git://github.com/dmonllao/moodle