Merge branch 'wip-mdl-40404' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Jul 2013 07:43:43 +0000 (15:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Jul 2013 07:43:43 +0000 (15:43 +0800)
commitd06f10cf97f42e846e5a5201b4940f8e97374df1
tree0b5efdc39e5d6da7e643aaf3e6fdd723424b0b4a
parenta6673a8b04357456adb12b0808e95c30fcba9750
parentc513812cd911049a572bb3b8b47560dd12bbab55
Merge branch 'wip-mdl-40404' of git://github.com/rajeshtaneja/moodle

Conflicts:
lib/upgrade.txt
lib/upgrade.txt