Merge branch 'MDL-35664-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 02:42:51 +0000 (10:42 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 02:42:51 +0000 (10:42 +0800)
commita7aa82b3ac7f09dd732837ce62dced921b799221
tree40f5cddb8a3d1afe7bcc9654d486ad8a931fca42
parent0651778e95a3581a7d111bd3fa5f2fcd952347ce
parent7dab27b31338ca0df1840d8fccc4ced211471d84
Merge branch 'MDL-35664-master' of git://github.com/FMCorz/moodle