Merge branch 'wip-MDL-33746-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 5 Jul 2012 12:19:06 +0000 (14:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 5 Jul 2012 12:19:06 +0000 (14:19 +0200)
commit8049a5c4138724337bb7ad3cea8ee1fa6128ad5a
treef690761b7fdde4fe1acedb16468174426935110f
parent05038fcba0611f1623b86d4bc70199bb293c42ef
parent4b8d51d79aa33856fe4f76a6c4c2cdda525bc280
Merge branch 'wip-MDL-33746-master' of git://github.com/marinaglancy/moodle