Merge branch 'wip-MDL-33957-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Jul 2012 02:57:41 +0000 (14:57 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Jul 2012 02:57:41 +0000 (14:57 +1200)
commit04573eaa650a7cd45352959dcb04746e513abf2e
treea3861ba1af053fafdf76e385a7f6765900abcf90
parent114244ce6cd2f5f12e2516f38a6ee7db7adbd339
parent8231a0ca2a894bc5b0f782ff17de438ccd2556ea
Merge branch 'wip-MDL-33957-master' of git://github.com/phalacee/moodle