Merge branch 'wip-MDL-48794-m28' of git://github.com/marinaglancy/moodle into MOODLE_...
commit17f0e2a4afacb969796447373d33b4d470d6f9c2
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 12:05:16 +0000 (9 13:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 12:05:16 +0000 (9 13:05 +0100)
treefbf00df2eacb6bd6f6aa25e36a7f2a16a2a5fee5
parent65610151658e024c56bab5564a05c83fc01307b7
parent054609f8b041b1ea2c740af527a03d8f2509d70b
Merge branch 'wip-MDL-48794-m28' of git://github.com/marinaglancy/moodle into MOODLE_28_STABLE