Merge branch 'wip-MDL-25275-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 02:11:04 +0000 (10:11 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 02:11:04 +0000 (10:11 +0800)
commitee17d12db16ab41af8733099db504d1d950e26a2
treed2d55f9617b269cfde1ff3758421bf69508eb68c
parentf42010d10d6a46c0a6455cdc9ad7878a672bb039
parentc0e98e83c8f0a21acb9ca20cbf018c51df9bcddf
Merge branch 'wip-MDL-25275-master' of git://github.com/abgreeve/moodle