Merge branch '48189-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Nov 2014 10:18:16 +0000 (11:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Nov 2014 10:18:16 +0000 (11:18 +0100)
commitabe9be7240d7bda36bd3831b3638795466987745
tree604b0e585a0ff30c5a96fb2bc5128e8acffa98ad
parent22fc0d15dd0e9bd2df92c677741b8c1f589f6d84
parentcb2cf2fed37dd159e9740e9643525dc236d36a75
Merge branch '48189-29' of git://github.com/samhemelryk/moodle