Merge branch 'wip-MDL-36915-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 21:27:25 +0000 (10:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Dec 2012 21:27:25 +0000 (10:27 +1300)
commit6d48072205348785f1e869a2f4878a6f74f2ba0f
tree96642f050c32ff54002c51ba4e7021a9fdce2b33
parentd229ac0f0a61e795d8c7aad97a3464c17aa269d2
parentdfdd9c9b114ac4fdcfeb414b377bb5bb6404f17b
Merge branch 'wip-MDL-36915-master' of git://github.com/abgreeve/moodle