Merge branch '44547-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE
commit46e04019c265c19a5b998f404fdee892e7113312
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Mar 2014 23:29:13 +0000 (11 00:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Mar 2014 23:29:13 +0000 (11 00:29 +0100)
tree8a8c846f1d1134e93864fd38d92b654225433cd1
parente75faa20f64df69723410e0b15c1f8cb0247b513
parentecba21b69545a87931ff20dcfdef8cfdcc15d8bf
Merge branch '44547-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE