Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Sep 2013 19:55:41 +0000 (21:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Sep 2013 19:55:41 +0000 (21:55 +0200)
1  2 
login/token.php
webservice/lib.php

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