Merge branch 'MDL-19391-master-1' of git://git.luns.net.uk/moodle
commitbc0be2fb800e963528a36fc62406f450e4109719
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 00:16:35 +0000 (30 12:16 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 00:16:35 +0000 (30 12:16 +1200)
treee6ce1c77b91dff044b984da3e4ccc25de3e6574a
parent49ddf4195c6246f41214fa30e143293b3fc4f3f9
parentaed560a19751b85f0cffa31685f94d92b9b37e7a
Merge branch 'MDL-19391-master-1' of git://git.luns.net.uk/moodle
mod/data/lib.php