Merge branch 'MDL-32978-master-integration' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 May 2012 06:43:31 +0000 (14:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 May 2012 06:43:31 +0000 (14:43 +0800)
commit1e1931a7976c132394213091b380ea313bd50f31
tree6b8ba58acdcfe2115a9d2deee19f60d78f968ad7
parentc459e91789ca94c56d40e57cc09259678f921cc8
parent6189c7b4d34f8c2ac40ab2d6cd18626ffde662d6
Merge branch 'MDL-32978-master-integration' of git://github.com/FMCorz/moodle