Merge branch 'MDL-49504-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 10:17:04 +0000 (11:17 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 10:17:04 +0000 (11:17 +0100)
commit29596525a36d05660250de9c4862b666d5b6ccd9
treedfd1386d696d7a10fb04bc8e044de946523f2dde
parent75ece778c5a760f79208065d118f2c9112878195
parent29ab635180916ba32c8bfae3371192ab9e032f87
Merge branch 'MDL-49504-master' of git://github.com/jleyva/moodle

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