Merge branch 'dev_MDL-27289_boxnet_master' of git://github.com/dongsheng/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 00:53:51 +0000 (12:53 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 00:53:51 +0000 (12:53 +1200)
commitc4b06ddd7549d9a273bb54dc4be1a5a247b5875b
treead3f36aa323b62f100eee5c23c92bf5b1a0131a3
parent18c8de5806bb76540000c5ff88981d9916955d55
parent3deff6c9d2bb4ab3144b3ca7b93d6a2ef6a87af2
Merge branch 'dev_MDL-27289_boxnet_master' of git://github.com/dongsheng/moodle