Merge branch 'MDL-52610_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 06:32:34 +0000 (14:32 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:07 +0000 (09:31 +0000)
commit8b9a15bbab788bbdb998c53c0033a07a6ad895d1
treed5b4655a3e8791e4654c83a32c79461e8f09760b
parent576d953415145bbc2fe8f67037062f4a6fb02f68
parent9ccc37291704fb988fa55e1f59c5c2c3be38b57a
Merge branch 'MDL-52610_master' of git://github.com/dmonllao/moodle