Merge branch 'MDL-28629' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 22 Nov 2011 05:26:35 +0000 (18:26 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 22 Nov 2011 05:26:35 +0000 (18:26 +1300)
1  2 
lang/en/webservice.php
login/token.php
webservice/lib.php

Simple merge
diff --cc login/token.php
Simple merge
Simple merge