Merge branch 'MDL-49337-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 09:55:42 +0000 (17:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 09:55:42 +0000 (17:55 +0800)
commit6f27fbb4353d7fd0a93890948fca72bbf739f699
tree0dbf5bb398bc635366f0545ed8e3171be6ccc871
parent636c609b242f1e97b0545da33b35caaae7a50205
parent067b3fda6ae068e23da122ade21ccbe53c86c02e
Merge branch 'MDL-49337-master' of git://github.com/jleyva/moodle

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