Merge branch 'MDL-40566_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
commitf2900567a8aacbe4597e64fe47d4b00f89910a2a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Sep 2013 20:07:04 +0000 (3 22:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Sep 2013 20:07:04 +0000 (3 22:07 +0200)
tree2f921ef985e1538501dd5194588d25364300020f
parent247f3e95e7975c8003de49747d8af5bca5738902
parentfe0f9adbe3508045f88fe5cb6c8ea5d4a10f3f6d
Merge branch 'MDL-40566_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE