Merge branch 'MDL-30677_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commitb3463f416c72287dd11c32f7ea5de05f5613c968
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 22:20:04 +0000 (13 11:20 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 22:20:04 +0000 (13 11:20 +1300)
tree07e2e57ac211210dcc181ccee540f6df56e7f9c5
parentfc97bb98637f736728c549b2fdcc8f75994a39a4
parent853f2e8eeab431832ab83f9dadf1859a3dd23d94
Merge branch 'MDL-30677_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE