Merge branch 'MDL-31811-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 02:15:23 +0000 (15:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 02:15:23 +0000 (15:15 +1300)
1  2 
mod/data/edit.php
mod/data/lib.php

Simple merge
Simple merge