Merge branch 'MDL-49453-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 1 Apr 2015 03:59:33 +0000 (11:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 1 Apr 2015 03:59:33 +0000 (11:59 +0800)
commit7c5dbf039636b811ab54439917e1378b80d8969d
tree73739c83e946c699ff5ab9819aebbf57d00f7c0e
parenta647e1f053a2648f3b50140c18fe6e1a8f0c8802
parentc4f7bf29b249e01bd1cd9f6cdd7d38929fa6c265
Merge branch 'MDL-49453-master' of git://github.com/jleyva/moodle

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