Merge branch 'MDL-32566_master' of git://github.com/kordan/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Apr 2012 00:05:09 +0000 (02:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Apr 2012 00:05:09 +0000 (02:05 +0200)
commitcb626376c1bddd7bf0a6f0dc5591de0c6b4a9524
treef4f6a0925b90d597e2eb89ef338a91306e308aa8
parent0317b8d4b35d0c5b4e41f57bbd608bf63e5ebde8
parent011c24fbe986b3a066317f922f8a5f19369822d2
Merge branch 'MDL-32566_master' of git://github.com/kordan/moodle