Merge branch 'MDL-37686-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2013 00:16:48 +0000 (01:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2013 00:16:48 +0000 (01:16 +0100)
commitce9c32363577b8cb5f718b1921ed33fe02422547
treee64a915b4659034ecfe9dc7430e75783abcd2fe8
parent625d5f8164e3c2a5d3f4071e09b93327c96e060d
parenta665e1b0135911ecc808cf34413f831a0d56ae94
Merge branch 'MDL-37686-master' of git://github.com/FMCorz/moodle