Merge branch 'MDL-50994-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Sep 2015 07:40:05 +0000 (15:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Sep 2015 07:40:05 +0000 (15:40 +0800)
1  2 
lib/db/services.php

Simple merge