Merge branch 'MDL-50839-master' of git://github.com/Dave-B/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:32:11 +0000 (08:32 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:32:11 +0000 (08:32 +0800)
commitf2e50523d1102b113fa02b69b7da24364d0e89b9
tree90537a3a535b1ef69113547ef6bcdd2a5a49db43
parent3718d2cd170e52d2543dfa02e66f32787d75d832
parent9dcd50358ab5c22db30a817370d7c7265e4393bd
Merge branch 'MDL-50839-master' of git://github.com/Dave-B/moodle