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)
1  2 
lib/testing/generator/data_generator.php
mod/forum/lib.php

Simple merge