Merge branch 'wip-MDL-25870-m21' of git://github.com/samhemelryk/moodle into MOODLE_2...
commit29d4f2eeb3bde96adbb82135eb9db62270835308
authorPetr Skoda <commits@skodak.org>
Mon, 18 Jul 2011 12:57:59 +0000 (18 14:57 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 18 Jul 2011 12:57:59 +0000 (18 14:57 +0200)
tree8c38b89bc9bc20a0987d3058b92e1dab2163fc6f
parenta699cbcdbc246f88c0a517856e3f7c8ed3bdbd8b
parentaa132e3f9b31f859b914f7c373e41807c66078b3
Merge branch 'wip-MDL-25870-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE