Merge branch 'master_MDL-28999' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 00:49:40 +0000 (02:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 00:49:40 +0000 (02:49 +0200)
commitc946644435d63272aa43dde2ffeaadab189b4d75
tree04066e3a1edb04e5e4279b5af8343bb2b9892546
parent906f11ef3b5a7237c820991619ae45e26db1015c
parent3b71ce6a5cb6d1e2869dc788decfb903b528b28f
Merge branch 'master_MDL-28999' of git://github.com/danmarsden/moodle