Merge branch 'MDL-38938_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:43:46 +0000 (23:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:43:46 +0000 (23:43 +0200)
commite6c7a5887b85f2df0ef19ab2d573de542954258e
tree9ed6a31df5bf42faa6ce51e8f41e9bb06c6cd716
parent36216331942b0a075746284bead2f39b50e4c27d
parent9bfdaaa54180d6a6365fffb0ad2ef6a247a7e53e
Merge branch 'MDL-38938_master' of git://github.com/dmonllao/moodle