Merge branch 'MDL-32107-master' of git://github.com/sammarshallou/moodle
commitd291dfd0aa32afbe86cba1d25b685bc2c0b3be62
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2012 22:42:59 +0000 (5 00:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2012 22:42:59 +0000 (5 00:42 +0200)
tree959b8be1984273c99be39ecb3b4c543de5b4f89d
parentc76bd308856ffa637ae5e778791c1d77e6d8fc61
parent38d06fea66063ca6574a473eec2904ac11912608
Merge branch 'MDL-32107-master' of git://github.com/sammarshallou/moodle