Merge branch 'wip-MDL-21097-m24' of git://github.com/marinaglancy/moodle into MOODLE_...
commit64a21db7668caf527d2a6ce6939d120cd5edea7f
authorDan Poltawski <dan@moodle.com>
Wed, 5 Jun 2013 05:10:46 +0000 (5 13:10 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Jun 2013 05:10:46 +0000 (5 13:10 +0800)
treefb0e9169e79ec062c1bab47178894b0c06553d4d
parent960a3215448213ea4334bfb37510b0551d3bd711
parent84031db72b13fef55f088be3854b905991fcf639
Merge branch 'wip-MDL-21097-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE