Merge branch 'MDL-36782-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 28 Nov 2012 09:51:33 +0000 (17:51 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Nov 2012 09:51:33 +0000 (17:51 +0800)
commitb58d1b9b1ca6bc5fd4e18dd6a9289dbde2c28318
treea5453120fd887d1f8749d5a7646a8fe5689bff7f
parent6f24d3183e96b00c5645333624c84d4a704136d3
parent261a89aaa50f68218772e600f8c25e7549502f28
Merge branch 'MDL-36782-master' of git://github.com/FMCorz/moodle