Merge branch 'MDL-42625_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
commit3675c9850668f1e50cc096578c40ba042489a174
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Dec 2013 22:31:51 +0000 (10 23:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Dec 2013 22:31:51 +0000 (10 23:31 +0100)
treee8a4a50dbd4c7fff40bed68f83989d9642f1d419
parent43ed2ccbf21c73d5112ab24c9e677259fef3e023
parentdb13e21956b069730203da772edfb1d69c5e3eb5
Merge branch 'MDL-42625_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE