Merge branch '23837-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jan 2014 22:42:55 +0000 (23:42 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jan 2014 22:42:55 +0000 (23:42 +0100)
commit382addccefaa9bcc0d93f46e93b648d68acdc785
tree52ee1ce6579ee2bcdb2688ac1e78a4c2591483d5
parent7ad46ac29dda3e1d773e9d075c1f28aa25ca34dc
parent3d907759ade10b639363267b1fcd4e22141ba30f
Merge branch '23837-27' of git://github.com/samhemelryk/moodle