Merge branch 'wip-MDL-38773-m25' of git://github.com/marinaglancy/moodle into MOODLE_...
commit61899ac202f9dbbe07d198385c5321b54b122b08
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 17:32:14 +0000 (5 19:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 17:32:14 +0000 (5 19:32 +0200)
tree3aaa1b2e0c0cc24346eb71832971f499b59bdca1
parent92c46e00eb10fa0ec0c5b5c61aee98bac60716a2
parent28ce5653c083fe90cc5a1ef2c97140d9b0ff389b
Merge branch 'wip-MDL-38773-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE