Merge branch 'w28_MDL-34175_m23_admin' of git://github.com/skodak/moodle into MOODLE_...
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Jul 2012 00:43:42 +0000 (12:43 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Jul 2012 00:43:42 +0000 (12:43 +1200)
commit3ca82ed605b69847456b62da482950ee9482ecef
tree62339c0a119e1746135b50fa2d05d1def499d03a
parent6b8399df5e8a24b27bd805176972914c809f1e33
parent93f3eb63d18f8f3584f4eff4a33e0bd37a98cb6b
Merge branch 'w28_MDL-34175_m23_admin' of git://github.com/skodak/moodle into MOODLE_23_STABLE