Merge branch 'MDL-26017_master' of https://github.com/ndunand/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 01:24:14 +0000 (14:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 01:24:14 +0000 (14:24 +1300)
commit22f098cd232801cb2631bc6e3d2152e32170ff3b
treef7a4b63e25260c98c8e27846feea5e2a506959c0
parent766ef7211baad31544407cb57954547cf95b381e
parent0ac6a57ec5a6a2be9d5f2fc13e2dae5ac0321d4c
Merge branch 'MDL-26017_master' of https://github.com/ndunand/moodle