Merge branch 'MDL-25847' of git://git.luns.net.uk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 3 Jan 2011 17:16:04 +0000 (18:16 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 3 Jan 2011 17:16:04 +0000 (18:16 +0100)
commitb095f1694790b3f8079454878f8e28c0614ec031
tree4e6d2007c9182eb27b0f93e1b614179007c40ce7
parent89881a345bd50647ee46f9759883638eb595c675
parent50542ff06a17e72cea3f87dffa5e2629785706c7
Merge branch 'MDL-25847' of git://git.luns.net.uk/moodle