Merge branch 'master' of https://github.com/moodle/moodle
authorPaul Charsley <p.charsley@massey.ac.nz>
Mon, 3 Sep 2012 20:58:31 +0000 (08:58 +1200)
committerPaul Charsley <p.charsley@massey.ac.nz>
Mon, 3 Sep 2012 20:58:31 +0000 (08:58 +1200)
commit5e21657f87ec6cd6ca5281205bc3b776a2ec8e0d
treed52c5453e124ec156ddc53d9123c3230fe0cb4de
parent4873a890df33c8d529e47bcde170ffb281ae0cf4
parent569f1ad63b7a2bc31728582a102ae75f92799f9a
Merge branch 'master' of https://github.com/moodle/moodle

Conflicts:
files/externallib.php