Merge branch 'MDL-49942-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 20:52:13 +0000 (22:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 20:52:13 +0000 (22:52 +0200)
1  2 
lib/db/services.php

Simple merge