Merge branch 'MDL-40405-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Jul 2013 07:47:07 +0000 (15:47 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Jul 2013 07:47:07 +0000 (15:47 +0800)
commit0574cd90612d7e97c04006a85d3ee65bb7a6d152
tree9aeec81341cf5883e775c7f0a11166aa22a6a6f0
parentd06f10cf97f42e846e5a5201b4940f8e97374df1
parentf9aa8016b10c09a5a449e609caa2507212b8c548
Merge branch 'MDL-40405-master' of git://github.com/FMCorz/moodle

Conflicts:
lib/upgrade.txt
lib/upgrade.txt