Merge branch 'MDL-55928-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Oct 2016 06:59:11 +0000 (14:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Oct 2016 06:59:11 +0000 (14:59 +0800)
commita955953c4113d5f45fe80dda60e445dcf8c7a2be
tree19107e80bdd5c168d94f5515a9ae0b5f17465c18
parentd4566644f62328d3deac842f85e91a609b26bfb3
parent08d7965e6308804ad9ffbac1320673c9f79b2126
Merge branch 'MDL-55928-master' of git://github.com/jleyva/moodle