Merge branch 'wip-MDL-28137-master' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 18 Jul 2011 13:22:29 +0000 (15:22 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 18 Jul 2011 13:22:29 +0000 (15:22 +0200)
commit6857b0db47c72cdb4838a0992395c3d2f2e58399
tree5f5c0557c3cd906a4ba69f85e5baedf1c04dea6c
parentc051470207791f0fb616d1d151d4611c070ed662
parentf50243edefe86df344f16814bf671b42cb3a5eae
Merge branch 'wip-MDL-28137-master' of git://github.com/samhemelryk/moodle