Merge branch 'MDL-45721_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
commit4fdbb2424308f19c52afe81112b6903e499c8695
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 23:00:21 +0000 (24 01:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 23:00:21 +0000 (24 01:00 +0200)
treef70c72e0fc9eb7e47c467e87abd3272b1946edbc
parent32b48768d47f030e79296257add966e697076a58
parent9f6a3aee9524e06c8b2506dd02107123c54efcd9
Merge branch 'MDL-45721_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE