Merge branch 'MDL-54582' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 May 2016 03:17:08 +0000 (11:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 May 2016 03:17:08 +0000 (11:17 +0800)
commit7b7b990e436d96e51095f961ee8a9675585d65bf
treed0b0a52b505ea567e720fe9ed9bbdb2b64338fca
parent13c6946d9298de467a30ea41687e4cfe8d6db374
parent795efd9c1b2cc3763a901b30003d4e5a5cfbdcf6
Merge branch 'MDL-54582' of git://github.com/timhunt/moodle