Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 27 Mar 2013 02:06:30 +0000 (10:06 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 27 Mar 2013 02:06:30 +0000 (10:06 +0800)
Conflicts:
lib/upgrade.txt


No differences found