Merge branch 'MDL-24355_emergency_21' of git://github.com/stronk7/moodle
authorPetr Skoda <commits@skodak.org>
Wed, 13 Apr 2011 14:48:38 +0000 (16:48 +0200)
committerPetr Skoda <commits@skodak.org>
Wed, 13 Apr 2011 14:48:38 +0000 (16:48 +0200)
commit2c55034844a75384f037b84639b1b4ac5f9fd2db
tree4e9ab1133437f636d5046c48d786133900ddadf0
parentfe0ccf0c792c0d241438e19fb10d1cc747402c89
parent1c2cfff051c7504e237fd82ae8f2167ba12d23fc
Merge branch 'MDL-24355_emergency_21' of git://github.com/stronk7/moodle