Merge branch 'MDL-41756-master' of https://github.com/jamiepratt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 4 Feb 2014 23:35:11 +0000 (12:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 4 Feb 2014 23:35:11 +0000 (12:35 +1300)
commit8213574043505acc276150ff9be13c415a2c75c6
tree613c4dd3518195130d072b1d0602c4b7eb599b09
parent9433b01c94c9a4d56a6dd124ed1811dc0e56646c
parent4f7516f6e84bb9094f98c9253c9bda4ff5f24256
Merge branch 'MDL-41756-master' of https://github.com/jamiepratt/moodle

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