Merge branch 'MLD-27565-wip' of 'git://github.com/mouneyrac/moodle.git' with changes...
authorSam Hemelryk <sam@moodle.com>
Wed, 8 Jun 2011 02:11:51 +0000 (10:11 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 8 Jun 2011 02:11:51 +0000 (10:11 +0800)
commit0373264c2048a3f24b7afbb162cf66bb25621df5
treee169ae92c4e8a7554e326e665a7be86019e53337
parent78736e5d64dfd4cc3a636f05920144545a0451ac
parent8d46dabb6e1dd951d7022d2c14fcccf5d1260d4d
Merge branch 'MLD-27565-wip' of 'git://github.com/mouneyrac/moodle.git' with changes and conflict resolution for MDL-27565
lib/db/services.php
notes/externallib.php
version.php
webservice/simpletest/testwebservice.php