Merge branch 'MDL-54049-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 May 2016 02:34:34 +0000 (10:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 May 2016 02:34:34 +0000 (10:34 +0800)
commit63c492ece0a4bd48000f6c149191c3f60dd07d64
tree97eb2c1d56130cf93521fd0ecb4d44f048617029
parent6b6847bc977daafeb73976aa6c7f5e8866a28422
parent871988b0b456ba04b0ae05ebb56dbb7fe1939b8b
Merge branch 'MDL-54049-master' of git://github.com/jleyva/moodle