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)
commit94211c02c33ef93e4be6c0f0161c750b8bb3aa51
tree60ea7694a2993ddbf024507c8f0efb5bf9bb53e9
parent833d1eb0e2ab3cf306c93d8080e8ee439b0ba1c7
parentd733a8ccc3919d721ecc87783e1390d870347284
Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle
login/token.php
webservice/lib.php