Merge branch 'MDL-47465-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Nov 2014 02:30:08 +0000 (15:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Nov 2014 02:30:08 +0000 (15:30 +1300)
commitcf033133424de48bf4b2a41bad056eeadb23d573
treed12e35bd52f8addd74d795f4100a114241d9383c
parentac4ed127de3a5f4cbfd312f44b7591eed25c0e3f
parentc4e3e128846450a99c77036908b86a833167a775
Merge branch 'MDL-47465-master' of git://github.com/ankitagarwal/moodle