Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 03:28:50 +0000 (16:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 03:28:50 +0000 (16:28 +1300)
commit94cdabcdee13d57206c545a3cb50b3aa976180ed
tree7924238753e8dbd94eb068fada3c37f8d8fac3a4
parent8dfd73e04a875b80087dac786f90767ecd049e8b
parent77c0a68db9c782adb53c86126a5f868b917eec53
Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle

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