Merge branch 'wip-MDL-37011' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 19:42:40 +0000 (08:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 19:42:40 +0000 (08:42 +1300)
commit8ebf086d31d1b7c60fba768c60dc1baa77164a82
tree37a88d5f48bdf83742264ffc892cd20460043ed5
parent303cccc5a69d78ca6020edcf59cfc89e471c8f1a
parent5cc0c73ab2085bcc1aa5f5abebe25b1b0c082c6a
Merge branch 'wip-MDL-37011' of git://github.com/abgreeve/moodle