Merge branch 'MDL-38330-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2013 00:19:17 +0000 (01:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2013 00:19:17 +0000 (01:19 +0100)
commitdc1abf2bc4f4510ba19359048325eff5061a5495
treeeae590d042535ac9726edeb42ca8d6a241527033
parente6f94aaa11c20058d323dc1d84e17d092badbc31
parentb75f1575c6326aa17f2cb4f9bffa67bd01e1bb5b
Merge branch 'MDL-38330-master' of git://github.com/FMCorz/moodle