Merge branch 'MDL-49425-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 23:39:39 +0000 (00:39 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2015 23:39:39 +0000 (00:39 +0100)
commit8251b4b055a6f6cedbb4461215a3804d1f2f153a
treeea397e242a4e7adc7446b2ba5d307c09f83e27c8
parentfb42902b28c9ac318979a9fec6285c9969ffbbba
parent116c4a62c7d31ae936773fc392b61acad192e4fe
Merge branch 'MDL-49425-master' of git://github.com/jleyva/moodle