Merge branch 'master_MDL-35227' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 19:39:07 +0000 (21:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 19:39:07 +0000 (21:39 +0200)
commit60e5d95a317b03cf20bedd1ad1676f2eb8c9f72c
tree170d77f403e0a65b76574af8bd799235177029a5
parent5a2c3743265d7d19aba4b9e4c3a721c2aa23c28e
parent3270869aab261284c01762a691c1efad70fdca81
Merge branch 'master_MDL-35227' of git://github.com/danmarsden/moodle