Merge branch 'MDL-57213-master-2' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Dec 2016 05:06:18 +0000 (13:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Dec 2016 05:06:18 +0000 (13:06 +0800)
commit01c7c3d8fb347675ee3b4c19432b90f0cb30fb8b
treef9867f5373303b8a44ac6f2dc83d2697e3d1a5d7
parent08f96ac9d718d7e9d4e6ba6672bfeb5774dd9585
parent8aedc0375404adccac3c5715e12ee28f073e2520
Merge branch 'MDL-57213-master-2' of git://github.com/junpataleta/moodle