Merge branch 'MDL-40652_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
commitb5d967cb1defa01eb26b34b406eebf7698309a26
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:41:19 +0000 (17 00:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:41:19 +0000 (17 00:41 +0200)
tree4f1829d8d00b1e86bcaf7ab7b056665293f374ec
parentc59f83cec25e62cf0564a7dbb7147e14962e73a0
parent7836d4c93ea917ecf928c4fdaff9b5bf8ab984ab
Merge branch 'MDL-40652_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE