Merge branch 'MDL-55237_30' of git://github.com/dmonllao/moodle into MOODLE_30_STABLE
commit4a59ad116844450a772ac8b8ee247e48a4aa64ea
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Aug 2016 10:55:03 +0000 (30 12:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Aug 2016 10:55:03 +0000 (30 12:55 +0200)
treed19a51bc34961e755282cd32026e5ea39f358f8b
parentc6adb4206339ffafaa2dd1f637bfdb7d6d64dea9
parentabac5252aaad34c4b3d0e59f813ca9bfc9c6db68
Merge branch 'MDL-55237_30' of git://github.com/dmonllao/moodle into MOODLE_30_STABLE