Merge branch 'w04_MDL-26045_20_onlineblock' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 02:45:46 +0000 (10:45 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 02:45:46 +0000 (10:45 +0800)
commitf8b214e1cde48ae1d02798a9ab387981ee0a2158
treee1c3534eda227ba1549d064f934a91916f683186
parente53a87dcb59247df40c92f7a9a36ca0c34400576
parentfb7dd39ce78b08633157a4ce1aaca6f9658451e1
Merge branch 'w04_MDL-26045_20_onlineblock' of git://github.com/skodak/moodle