Merge branch 'MDL-53976-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 04:05:43 +0000 (12:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 04:05:43 +0000 (12:05 +0800)
commit128beb3d39de1add7b49afb1108ee55851af75ca
tree09b4e414f2a57dc654242fc22e0a1b1c5be84c32
parent7adbac5a8ed93208ffd676dcb1e9abcf5bfd3892
parent9be3072d338d8591e96031d2381177d067902abd
Merge branch 'MDL-53976-master' of git://github.com/jleyva/moodle