Merge branch 'MDL-36718-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 29 Nov 2012 04:51:00 +0000 (12:51 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Nov 2012 04:51:00 +0000 (12:51 +0800)
commit88ee671baed967ce579561a6f9a20daf221e5681
treec648e3af46d967cdda3200d9e45cb61c051def41
parent694b2e20bbb293c1e677d10dc73402ca46fa5726
parent94341a7c50c6200da516a6a9caeccbbbecd76a71
Merge branch 'MDL-36718-master' of git://github.com/FMCorz/moodle