Merge branch 'MDL-50546-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 05:41:35 +0000 (13:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 05:41:35 +0000 (13:41 +0800)
1  2 
lib/db/services.php

Simple merge