Merge branch 'MDL-29115' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 24 Nov 2011 22:53:24 +0000 (11:53 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 24 Nov 2011 22:53:24 +0000 (11:53 +1300)
commitd905b69e95d675e032f4f93ce6afe1f86cb254c2
treef27c5c43d7c21d1a2d3891c9fb40f8db52996aa4
parent7355a8e4b7de6eb6caeb0d7871da89b77be2ce09
parent4fd95658bb080942f6a20bec92329f43fd3a2ccd
Merge branch 'MDL-29115' of git://github.com/rwijaya/moodle