Merge branch 'wip-MDL-34074-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 6 Aug 2012 01:36:44 +0000 (13:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 6 Aug 2012 01:36:44 +0000 (13:36 +1200)
1  2 
lib/tablelib.php
mod/data/lib.php

Simple merge
Simple merge