Merge branch 'MDL-34872-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 04:10:01 +0000 (12:10 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 04:10:01 +0000 (12:10 +0800)
commitc46b44154a78c615f3808b62bd31a05a0fe2c128
tree23b0f8d6b1a89fd2295120865e99da869cead3b0
parenta563bdc1199f04c8c5f617de77c15d3e28d5386a
parent928928490db086a5b38c133f840e52a8c70470ac
Merge branch 'MDL-34872-master' of git://github.com/FMCorz/moodle