Merge branch 'MDL-41910_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 01:09:51 +0000 (03:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 01:11:53 +0000 (03:11 +0200)
1  2 
lib/datalib.php

diff --cc lib/datalib.php
Simple merge