Merge branch 'w15_MDL-38989_m25_ttfinal' of git://github.com/skodak/moodle
commitb812305ef65416b5b9b3302e20b764c7aa080715
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Apr 2013 13:45:16 +0000 (10 15:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Apr 2013 13:45:16 +0000 (10 15:45 +0200)
treed5ff867023bce4f3af8448b81623be97019466a0
parenta4b524e9313909e558c47c8d6e611cb381f10f7d
parent0ddd65d9e00dc468d96090f43908e4e4a632819d
Merge branch 'w15_MDL-38989_m25_ttfinal' of git://github.com/skodak/moodle