Merge branch 'MDL-36616-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 03:48:11 +0000 (11:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 03:48:11 +0000 (11:48 +0800)
commit4a489ba46544c9d46637c806756bf9ce8cd6623b
treef248c3fa8c4a6eab7e4a99ca3931891bcfdf5c69
parent33919cca605b333f28e7abf36d98e55dd0e4684c
parentcd2b223dc7ba00d8869f34cb0e011fd8c160b228
Merge branch 'MDL-36616-master' of git://github.com/FMCorz/moodle