Merge branch 'MDL-30734' of git://github.com/timhunt/moodle
commit90179a509359c709b34cc15fc9482bcf0bdec6fd
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 22:52:49 +0000 (19 11:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 22:52:49 +0000 (19 11:52 +1300)
tree968f22b3daf7804acabf0e669a9b9ca05bd22ff5
parent6ccf06637fb74d8e00ecbd9f88e5bf5264dba05a
parentad73a2cb4e1b853e35f49dd2e30ac5994c6e513c
Merge branch 'MDL-30734' of git://github.com/timhunt/moodle