Merge branch 'wip-MDL-27696-master' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 18 Jul 2011 13:17:05 +0000 (15:17 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 18 Jul 2011 13:17:05 +0000 (15:17 +0200)
1  2 
lib/datalib.php

diff --cc lib/datalib.php
Simple merge