Merge branch 'MDL-26847_amended' of git://github.com/timhunt/moodle
commit25bd4d9a375b83655b2d8c82f5f3d6780c321042
authorPetr Skoda <commits@skodak.org>
Mon, 21 Mar 2011 17:10:35 +0000 (21 18:10 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 21 Mar 2011 17:10:35 +0000 (21 18:10 +0100)
treee0f9a1438d0c816e0f076c0eb3a522c36b7640b1
parent4386e0d1019f1b04b13339cc93fd7b9c650c2638
parentaf7b3673d725781654db7e8603e341951dc325f6
Merge branch 'MDL-26847_amended' of git://github.com/timhunt/moodle