Eloy Lafuente (stronk7) 8ac9d33f49 Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle ...

Conflicts:
	lib/db/upgrade.php
	report/completion/index.php
	report/progress/index.php
	version.php

2011-11-11 03:37:55 +01:00

..

db

…

lang/en

…

index.php

Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle

2011-11-11 03:37:55 +01:00

lib.php

…

textrotate.js

…

user.php

…

version.php

…