Merge branch 'MDL-26774-wip' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 06:11:58 +0000 (14:11 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Jun 2011 06:11:58 +0000 (14:11 +0800)
1  2 
lib/db/services.php

Simple merge