Merge branch 'wip-MDL-35265-master' of git://github.com/abgreeve/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 16 Oct 2012 02:46:11 +0000 (10:46 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 16 Oct 2012 02:46:11 +0000 (10:46 +0800)
commitcb6b5fb6256bf32592b6a44fcc1742ac4ae92486
treea0c2dc846ed32845e306b66d1b7adeadc8554da8
parenta7aa82b3ac7f09dd732837ce62dced921b799221
parentc0a059260faf90ab1ffff9f6ff2e533f43138c1e
Merge branch 'wip-MDL-35265-master' of git://github.com/abgreeve/moodle

Conflicts:
version.php
lib/db/upgrade.php
version.php