Merge branch 'MDL-51245' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Sep 2015 01:24:00 +0000 (09:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Sep 2015 01:24:00 +0000 (09:24 +0800)
commitfd23f8e7b25e8b346bee8216f6363aa4de8fc43b
treea1ccf6b077b0f43f8fa48161cd5b5db19eb6aceb
parentebdfde7664b0d08553630c8ecdabcf070a5dbf51
parent48657a6713b592aee7adbd362e1da1f6c5909c4d
Merge branch 'MDL-51245' of git://github.com/stronk7/moodle