Merge branch 'wip-MDL-47079-m27' of git://github.com/marinaglancy/moodle into MOODLE_...
commit074b467000761d93f30a24891f9df34522046039
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Sep 2014 16:38:53 +0000 (16 18:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Sep 2014 16:38:53 +0000 (16 18:38 +0200)
tree7bbe3924c748fa35cf1053806ccc1a0fbf9a81ef
parent35fa1656abbc73da82b5ac0a0cfe03206784e926
parentdf45195a045ee2bd67a7b93fa6a3e68781c565c3
Merge branch 'wip-MDL-47079-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE