Merge branch 'MDL-32309-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 19 Sep 2012 08:10:50 +0000 (16:10 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 19 Sep 2012 08:10:50 +0000 (16:10 +0800)
commit99a0936f62f31cb111bcaa8fe09652bf938b5672
treebf4152d2dd98a8816a6e41ee8e3be1b22723081f
parentae0f6adeaa2da17a3aaeee000665664a40d16725
parente57948f58b1a1bde6917a4ce15095395ddead8ec
Merge branch 'MDL-32309-master' of git://github.com/FMCorz/moodle