Merge branch 'MDL-40406-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Jul 2013 07:49:45 +0000 (15:49 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Jul 2013 07:49:45 +0000 (15:49 +0800)
commit9e40816b3a88919942d3d158516ef8b6698c40ef
treea5ad13e5633d632585cc890ba2cf403a7e7069eb
parent0574cd90612d7e97c04006a85d3ee65bb7a6d152
parentcc4de415b4a6a9d7dfcc3f67194c455c08cdf3e1
Merge branch 'MDL-40406-master' of git://github.com/FMCorz/moodle

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