Merge branch 'MDL-49501-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 09:03:28 +0000 (10:03 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 09:03:28 +0000 (10:03 +0100)
commitffb4eaa93fb956076544e995341a387ba50f289d
tree2b4f254c1381c7194340a015e9a4d77e3285e9d5
parentb6c34ef9f5830071ce4d1b1adbc2c0c5405398e9
parentb679582707e838e2b37eeef9e06fb1f3f466affc
Merge branch 'MDL-49501-master' of git://github.com/jleyva/moodle

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