Merge branch '44195-27' of git://github.com/samhemelryk/moodle
commita9d44ff518b9c16efe5d97467fe30f8c47b28fbb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Feb 2014 00:02:00 +0000 (19 01:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Feb 2014 00:02:00 +0000 (19 01:02 +0100)
tree796b8fa73c0bfc3106186cd7b984e391231b2920
parentbfe7c33c07406911cfbec85eea7289bb49d0d337
parent0ba796fdeee954fdc8f1232b33f379511ca4937f
Merge branch '44195-27' of git://github.com/samhemelryk/moodle