Merge branch 'MDL-31926-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 04:12:54 +0000 (12:12 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 04:12:54 +0000 (12:12 +0800)
commit7447d328ddc4947698c4303868529a3d3743dbdd
tree69dc6acd4f4989e5729dc2c57de74c827b406eeb
parentc46b44154a78c615f3808b62bd31a05a0fe2c128
parentc216eb20086f120262602ad9f192106eac7ed9fc
Merge branch 'MDL-31926-master' of git://github.com/FMCorz/moodle