Merge branch 'MDL-49338' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 05:32:00 +0000 (13:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 05:32:00 +0000 (13:32 +0800)
commitbde3e8c5d1e5730c8f576a0572b77b26648de0a4
treed17c1980e7ef3cfbd3cb2365c1479ff7568add9b
parent7bf992cccbb9e8e0c2df9b1c79150523254bc257
parentde3b803deade5f74bd7a38e6fc39b474617d3755
Merge branch 'MDL-49338' of git://github.com/timhunt/moodle