Merge branch 'wip-MDL-43333-master' of git://github.com/marinaglancy/moodle
commitbc6d39a561eae77a6b11bed4578e2a7b20694e88
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:59:50 +0000 (21 01:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:59:50 +0000 (21 01:59 +0100)
treef120c2ff02ccc8c2641cdeb92233cedabd31f2a7
parentba766c47721abb62c9402fa6e964659915ce46e3
parent0c74b33fbfdb3522c511d25a77434690fe7c0980
Merge branch 'wip-MDL-43333-master' of git://github.com/marinaglancy/moodle