Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Nov 2012 03:04:23 +0000 (11:04 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Nov 2012 03:04:23 +0000 (11:04 +0800)
commit3c9b489820a83cbbad08d2939bb838adc7fdad64
tree59cdf3fade101fe254f21b42dc036331be33f9c8
parent05f2bdea31de56ebbb30a20ca29e51a630056dc6
parent3776335ce21bf249be58ea2ebf5ae15c9ff983fa
Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle
lib/moodlelib.php