Merge branch 'MDL-49347-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 19:25:28 +0000 (20:25 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 19:25:28 +0000 (20:25 +0100)
commit89c3afc2c594097f0e65ac8d5b25e706d138d6a6
tree213d9398bc516c57120f19c03fd71d0a3f7f37c4
parenta7d5af2d82b4da07a8486180f5771d0964d57656
parenta955fcb6086540bb3affccd6b5f766b931675d63
Merge branch 'MDL-49347-master' of git://github.com/jleyva/moodle

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