Merge branch 'MDL-35443-wip' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jan 2013 21:20:46 +0000 (10:20 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jan 2013 21:20:46 +0000 (10:20 +1300)
1  2 
lang/en/webservice.php
lib/db/services.php

Simple merge
Simple merge