Merge branch 'wip-MDL-28292-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Nov 2011 23:24:26 +0000 (12:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Nov 2011 23:24:26 +0000 (12:24 +1300)
commit68bcca4d04fa953581ba9e6183f465e2237ffdd5
treedc51bbb47e9d67600b350067b74e07e53db12a84
parenta86529bdeb12c3d2f367d904fc8ced1826f56257
parentbaf9c832dea61b1fa79b9553f09c6dc008280acd
Merge branch 'wip-MDL-28292-master' of git://github.com/phalacee/moodle