Merge branch 'wip-MDL-29496-master' of git://github.com/phalacee/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2011 09:00:04 +0000 (11:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2011 09:00:04 +0000 (11:00 +0200)
commit36903cece3f45491719db1440ee4c254e4480d6a
treee2d38b5febc9a938974b4a9334756e4f6792d9c0
parent77c3e9d0c63524ce8e614d6edf63c44a2a8ce349
parentfc0aebb595ce50210b97cb1946b149f1be1b6180
Merge branch 'wip-MDL-29496-master' of git://github.com/phalacee/moodle