Merge branch 'MDL-33775-master-integration' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 07:18:02 +0000 (15:18 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 07:18:02 +0000 (15:18 +0800)
commite73c1cafa1c3c46deca1e9cd7de01e361ab5b5aa
treeca5f7ba9223e103b113cf43a1d9b336940e3f9c9
parent584c219edfedab733fd46fce17bafd63b2ebbedd
parenta41b1d96b66b015a8d6dcde4342b6e502396beed
Merge branch 'MDL-33775-master-integration' of git://github.com/FMCorz/moodle