Merge branch 'MDL-31496_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Sep 2012 00:20:38 +0000 (12:20 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Sep 2012 00:20:38 +0000 (12:20 +1200)
1  2 
mod/data/lib.php

Simple merge