Merge branch 'w28_MDL-34175_m23_admin' of git://github.com/skodak/moodle into MOODLE_...
authorDan Poltawski <dan@moodle.com>
Wed, 11 Jul 2012 06:51:07 +0000 (14:51 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 11 Jul 2012 06:51:07 +0000 (14:51 +0800)
commit4697c4670680d7ab64400e3131944adfa50bb25e
tree497e4d07d8cd12274374134e3438cdc610eacf69
parent229aabf7c6b25ec4f63339a5bf0d0ae9549a0925
parentdf7799d989ed18be0ce98f90a788e2643069f81e
Merge branch 'w28_MDL-34175_m23_admin' of git://github.com/skodak/moodle into MOODLE_23_STABLE