Merge branch 'wip-MDL-26754-master' of github.com:marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 11:07:54 +0000 (13:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 11:07:54 +0000 (13:07 +0200)
commit50c89706a760b5025c234da9a7346599e6872b05
tree2488b2c7a700c1bc1c0f722434d0fd50c42c65ec
parent78fe1bad479569b68a5a646fdddb3657e511e7df
parent03909d79e40af0a7585370b2ad12fdaeeae28fc4
Merge branch 'wip-MDL-26754-master' of github.com:marinaglancy/moodle