Sam Hemelryk 233e6b985b Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle ...

Conflicts:
	lib/upgrade.txt

2013-12-17 16:32:35 +13:00

..

otherusersmanager

MDL-35802 enrol other users: should use Show user identity setting.

2012-10-05 12:07:26 +01:00

rolemanager

MDL-43259 JavaScript: Stop using deprecated lightbox config setting when instantiating dialogues

2013-12-11 16:56:49 +08:00