Merge branch 'wip-MDL-43150-m26' of git://github.com/marinaglancy/moodle into MOODLE_...
commit6085ca703d17a06aee6b9ba30a299b783c155f0c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Dec 2013 21:47:29 +0000 (10 22:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Dec 2013 21:47:29 +0000 (10 22:47 +0100)
tree4ea3de6b0a9f8a439567bdb057f8c54694fdbaa8
parentbdb2677b79250de4f8f14cd891cc5b6905bb245d
parent4f7ec4804679822a367b98815ef19c73b909ec3b
Merge branch 'wip-MDL-43150-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE