Merge branch 'MDL-39635_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
commite024b7130afe7433e7cf26d1749630d493a6bd46
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2013 22:45:20 +0000 (23 00:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2013 22:45:20 +0000 (23 00:45 +0200)
tree860ae9c016d9d76b9d551de99cd4be2e4d2d61eb
parented3a28dcecd483ed32538798bfeb96d91c3d38d8
parent55e9a99c1813a865cf12e29157777418a3903db1
Merge branch 'MDL-39635_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE