Merge branch 'MDL-36802-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 04:14:05 +0000 (12:14 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 04:14:05 +0000 (12:14 +0800)
commitdcb58f9d066209d55141e199aea0258274eb70c2
treea5eb7d2a7097769fe0d6cc3da122e51fe1c5b36a
parent58f46a0e66ca8257c2ff7d8d463632282ed4a5b8
parentbaf41e4b9962c5c19f87366ec8b242fcfa3ae536
Merge branch 'MDL-36802-master' of git://github.com/FMCorz/moodle