Sam Hemelryk 61e93a4c08 Merge branch 'MDL-27083-master' of git://github.com/FMCorz/moodle ...

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

2012-07-25 09:20:44 +12:00

..

access.php

…

events.php

…

index.html

…

install.php

Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle

2012-07-10 09:43:23 +08:00

install.xml

MDL-8249 install.xml - fixup use of editor

2012-07-17 07:55:38 +08:00

log.php

…

messages.php

…

services.php

…

upgrade.php

Merge branch 'MDL-27083-master' of git://github.com/FMCorz/moodle

2012-07-25 09:20:44 +12:00

upgradelib.php

…