Merge branch 'MDL-30498a' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 22:11:33 +0000 (11:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 22:11:33 +0000 (11:11 +1300)
commitde3e5df24f80f58c5251b1bafbbd26f2e30ec115
treea3f51e6640cb2f160d16a44d1f3726e99aae094a
parent0ebb6ff5b8f7a6206ec5b25f806b6aef47ea8050
parentbea2086c9524b6bb2a0b4055c5c82bb82fd6b9a5
Merge branch 'MDL-30498a' of git://github.com/timhunt/moodle