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)

Trivial merge