Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 20:50:31 +0000 (21:50 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 20:50:31 +0000 (21:50 +0100)
commit493d8f781c09230620374f6ea1d3e47baf68476d
treed32a07ec6442aa4c8828de9436d7a328c6b407d1
parent563bcc2322f1fab40cdba0a629a04342f172fb64
parentfb695f6e3d66938fba1940631db121572efcb232
Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle

Conflicts:
message/tests/externallib_test.php
lib/external/tests/externallib_test.php
message/tests/externallib_test.php
mod/assign/tests/externallib_test.php
user/tests/externallib_test.php