Merge branch 'MDL-26199' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 27 Jun 2011 08:03:48 +0000 (16:03 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 27 Jun 2011 08:03:48 +0000 (16:03 +0800)
commit29e2d0a820f2f4cf3286843177d79544ca45eb1d
treedd9bc52d171b66d984ea94ed0e0c26d7d4169d6d
parent35d4d85dc48ea0cf479e8bf1f5a6d744554712ea
parentf19ed874ee0866e6b78f03e6897233182f030c28
Merge branch 'MDL-26199' of git://github.com/timhunt/moodle