Merge branch 'MDL-52269_master' of https://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 00:45:42 +0000 (08:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 00:45:42 +0000 (08:45 +0800)
commit9dd33a288e5f8ac1bf851ca1a0033e5e321adedd
tree9101052cf6e72037e0e124b0070e187a321612a2
parentfe99a278592cf3b024522032d0743bc610e7842c
parent50e954163d7fc213088562c00ad0b7e0d181f62b
Merge branch 'MDL-52269_master' of https://github.com/dmonllao/moodle