Merge branch 'MDL-49500-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 15:44:41 +0000 (16:44 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 15:44:41 +0000 (16:44 +0100)
commit464ba8e5a0497ecebeb4b1ec81a390b5c8db82e2
tree09324631363e95532738d8cd921a6e2eea11d0a4
parent522eff0d3086afe85c8c5ba24d779de039987a4b
parent45e091ac270ad867c17c59c891304d948be09dc9
Merge branch 'MDL-49500-master' of git://github.com/jleyva/moodle

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