Merge branch 'wip_mdl-31968_mdl-23011_master' of https://github.com/iarenaza/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:13:06 +0000 (00:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:13:06 +0000 (00:13 +0200)
commit7447a1e55df3f19040df1585be651c6727aaa1bf
tree3a71e8e69cf8406f6fbb979bd43bcf9df9c6c077
parentf064d2ef696be13d0e462c0803980316fc461f21
parent34b10e26c650bb06bd9c50349508af7a52fee2fc
Merge branch 'wip_mdl-31968_mdl-23011_master' of https://github.com/iarenaza/moodle