Merge branch 'MDL-29640_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Oct 2011 21:15:46 +0000 (10:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Oct 2011 21:15:46 +0000 (10:15 +1300)
commit811cbdcfbf76bfb5c1467185e33ad728abe7a5c9
treefe49f0d181643625fabca10f0ad70cf62d571ac3
parentaabf13c24002d6b60e23d33aab920ffefcf411e3
parent210602485442ee6fe9d879c5d772c0c640dcd542
Merge branch 'MDL-29640_master' of git://github.com/kordan/moodle