Merge branch 'MDL-39661-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 00:54:22 +0000 (08:54 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 00:54:22 +0000 (08:54 +0800)
commitf6652bc750f0583eb07ab45aa652324508fad321
tree3e86bdf68ea26de6a3ae960be668c507c1ae8061
parent12efa52762064bf07af4559702fbb2d2f40f7194
parent686e3b3ae06a978cdf483a61d3977108071594cf
Merge branch 'MDL-39661-master' of git://github.com/FMCorz/moodle
lib/upgrade.txt