Merge branch 'MDL-43140_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE
commit008b26a6098ff663b1ddb5ade6fb26e7086ecb29
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 22:25:43 +0000 (3 23:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 22:25:43 +0000 (3 23:25 +0100)
tree6e0889f73bd5426779330f1c51e591a11994097f
parentd653c838b0d7547740c2f6a63ef2c7616d8dd603
parentc90c329d570b5d8e6b2ddd066ca58a390c8d2f83
Merge branch 'MDL-43140_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE