Merge branch 'MDL-33060' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:16:12 +0000 (10:16 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:16:12 +0000 (10:16 +0800)
1  2 
course/externallib.php
group/externallib.php
lang/en/webservice.php

Simple merge
Simple merge
Simple merge