Merge branch 'MDL-28689_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE
commit7ecabfdce4f7a05efe7851d9651d789a788b44a7
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Sep 2011 04:03:08 +0000 (5 16:03 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Sep 2011 04:03:08 +0000 (5 16:03 +1200)
tree3e72aed2db37fd1976878c3f4c11540ad8ed8289
parent02aac22ff8c0f821563fb4921344a37bd7fd453a
parente3a6a3878ee8f4cb43c1ccf14241e218b8ad9b55
Merge branch 'MDL-28689_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE