Merge branch 'master_MDL-29690' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Oct 2011 22:24:44 +0000 (11:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Oct 2011 22:24:44 +0000 (11:24 +1300)
commitf915430855c73baeb2f117dfdab9dece2196a6f4
tree4113d4ba0892288df79b9346e6139b7d18a17c38
parentb77088cd0483167b5c4d2d8419df6796d89b3676
parentc9b8a78951f055c328986d8f3756d7fba464df41
Merge branch 'master_MDL-29690' of git://github.com/danmarsden/moodle