Merge branch 'MDL-30102_master' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 5 Feb 2013 03:23:01 +0000 (11:23 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 5 Feb 2013 03:23:01 +0000 (11:23 +0800)
commit183e656eeaeb2b7c2f17b5c234671650cf5b6559
treeb024d182ef7292916c36f6f1ca9e14ad873feece
parentba076613d3f1a76d52e302a11814f4e4e0d3b986
parenta9a0cb691c5eb812f9427d44af07140defc54b8a
Merge branch 'MDL-30102_master' of git://github.com/markn86/moodle
lib/testing/generator/data_generator.php
mod/forum/lib.php