Merge branch 'MDL-57643-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Mar 2017 23:58:08 +0000 (07:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Mar 2017 23:58:08 +0000 (07:58 +0800)
commit9c2ca400417f5f1b3654d19966a5848d456298ba
tree0948a6f99f7b18291e8349309ef6dee90e45c5a0
parenteb6f04732aaa1b8a061c8d073a4cd4e836801796
parent630f0e3bced4f023669e1502555407a0d0056c75
Merge branch 'MDL-57643-master' of git://github.com/jleyva/moodle