Merge branch 'MDL-49330-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 09:06:20 +0000 (11:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 09:06:20 +0000 (11:06 +0200)
commit605324fb10f03d38ee35d1ae26df207a4dfd3337
tree394274ed754dabc2074fed9cc721871fd9e1b3c0
parent3b2e6aec620e16a76da68e9e5589fbb3f8ab8815
parent12068d65cb30f01af9a0426e16835703ea0c6378
Merge branch 'MDL-49330-master' of git://github.com/jleyva/moodle

Conflicts:
lib/db/services.php
version.php
lib/db/services.php