Merge branch 'MDL-37982_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:01:47 +0000 (00:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:01:47 +0000 (00:01 +0100)
commit80ba3a43902af16d72f849c4d153150fa198aa40
treedd00fb23585817a7cb9118facdb38f386f694d2f
parent41e94a8d6f58d1014024138e848f6b4fe5eb11b4
parent1f037b3776f4ce5a7c00881ca3dc2136b1a98f2a
Merge branch 'MDL-37982_master' of git://github.com/dmonllao/moodle