Merge branch 'MDL-41760-master-v8' of https://github.com/jamiepratt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Mar 2014 01:14:00 +0000 (02:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Mar 2014 01:14:00 +0000 (02:14 +0100)
commit1c774322babd6c388264d287290a67f7893d618d
treec85d00f7f795a9952f5d5530d3f00305fd139053
parentb9add57766b3b53796cc03a04f1880bffa9f9424
parent038014c415f04583e3abf000533e9c2ffaf86441
Merge branch 'MDL-41760-master-v8' of https://github.com/jamiepratt/moodle

Conflicts:
version.php
version.php