Merge branch 'wip-MDL-36240-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 13:30:57 +0000 (13:30 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 13:30:57 +0000 (13:30 +0000)
commit604090397aac3c7862c1168ea843a84b37768505
treefaaca266f056718ec50c5e745a0b4ecd2f684966
parentbb4013f5c78cbeb41d106759b04045a577215777
parentd983ac639422dedc990b89a160b162eb739e50d3
Merge branch 'wip-MDL-36240-master' of git://github.com/abgreeve/moodle