Merge branch 'wip-MDL-34318-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 2 Sep 2012 22:12:50 +0000 (10:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 2 Sep 2012 22:12:50 +0000 (10:12 +1200)
commit05f7680f3e72d2598ed65b426a5ed2f1fb69c613
treeacfd58a998cb7a068a83ba6fba494aed7ed59c18
parentf9e38429a851081f46c4cad34123ac1ab27a8d73
parentac31c38eedbb2fbb03b3aeb97617e71c14b5eb49
Merge branch 'wip-MDL-34318-master' of git://github.com/abgreeve/moodle