Merge branch 'wip-MDL-48325-27' of git://github.com/abgreeve/moodle into MOODLE_27_STABLE
commitdb8977f20900914b1036f5347bd00df6474ff69e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 23:26:07 +0000 (27 00:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 23:26:07 +0000 (27 00:26 +0100)
tree51907a69380ed77194a695c3cfabdacd8f711568
parentaf65e0db33868619ef0cc278840909e5ef532717
parent74783abd8d2e8366af941eb64c8a53f24c37a0da
Merge branch 'wip-MDL-48325-27' of git://github.com/abgreeve/moodle into MOODLE_27_STABLE