Merge branch 'MDL-30140' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 14 Dec 2011 01:08:37 +0000 (14:08 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 14 Dec 2011 01:08:37 +0000 (14:08 +1300)
1  2 
lang/en/webservice.php

Simple merge