Merge branch 'MDL-29341' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 20:50:18 +0000 (22:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2011 20:50:18 +0000 (22:50 +0200)
commit92c9bc61279e10dc170641b8e534a99cc8ecf212
tree1f98c85965e4aac82c57532a28511d16a25812f2
parenteefebc2edb3e71b1e298d46b3178ab5674f6aa64
parent522d9fcb2afb3019139571c3d83f88230c7669a0
Merge branch 'MDL-29341' of git://github.com/timhunt/moodle