Merge branch 'MDL-36628-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 02:10:04 +0000 (10:10 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 02:10:04 +0000 (10:10 +0800)
commit713a49298f4b6c95b69ec4601180a604b7b8c49a
tree4c79d35eee92b9d6635be6e445382d64bf7edec9
parentb144e12feb2ab4295c838383e636e0fc701cbb93
parentbdb66a463579397b8face6aa7ecae50931ff1879
Merge branch 'MDL-36628-master' of git://github.com/FMCorz/moodle