Merge branch 'wip-MDL-23532-master' of git://github.com/samhemelryk/moodle
commit6bc62c4486d67fc0bcbfcff9db80c65a1797dfc6
authorPetr Skoda <commits@skodak.org>
Mon, 25 Apr 2011 15:50:01 +0000 (25 17:50 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 25 Apr 2011 15:50:01 +0000 (25 17:50 +0200)
treebf9df9cbbcb5f4c5f74555a61ee84c22677a9f35
parent6e405dafde77fece78b4e7504cf6af517038cac4
parent884faffda328e397c0950a0031650e846355462b
Merge branch 'wip-MDL-23532-master' of git://github.com/samhemelryk/moodle