Merge branch 'MDL-43266_master-last-fixes' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 18:12:25 +0000 (19:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 18:12:25 +0000 (19:12 +0100)
commit1700bec3c64ae7f85bf868c826e3d6a0374e1c58
tree7bafe5a24f12c55dcd90fad6fad9bd02bde382b8
parentad246c2d2c8bf41e281749d36cfacfeac449cba9
parentd3daf24563d13180d683f0383c6deacd0b8bf01e
Merge branch 'MDL-43266_master-last-fixes' of git://github.com/dmonllao/moodle

Conflicts:
lib/phpunit/classes/util.php
lib/phpunit/classes/util.php