Merge branch 'wip-MDL-40038-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 07:51:57 +0000 (15:51 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 07:51:57 +0000 (15:51 +0800)
commit57cef30e42eed974e01819d058609f73ce240a49
tree688c9c43800ed0baef5e975b95d3e834d486e8af
parent531110c8905cd964739d4754e66b6523d7dab51f
parent196c8b71f1725206bd92c16ad3462220cd2db7a2
Merge branch 'wip-MDL-40038-master' of git://github.com/abgreeve/moodle

Conflicts:
files/tests/externallib_test.php
files/externallib.php
files/tests/externallib_test.php