Merge branch 'wip-MDL-36014-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Oct 2014 04:34:34 +0000 (12:34 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Oct 2014 04:34:34 +0000 (12:34 +0800)
commit4a813f3959265d7108087c54a7e55f336e0ca170
tree2bc25f8fb0aacb28196d924790188cfef74ba7ad
parent94cdabcdee13d57206c545a3cb50b3aa976180ed
parent9b65d0dd62db8a9414f04f6f75765031e063e98e
Merge branch 'wip-MDL-36014-master' of git://github.com/marinaglancy/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
lib/db/install.xml
lib/db/upgrade.php
lib/upgrade.txt
version.php