Merge branch 'MDL-43996-master' of git://github.com/jethac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 21:56:53 +0000 (10:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 21:56:53 +0000 (10:56 +1300)
commit7622b02f4c4edd249a45a6618d99ca264946648c
tree64a5b3e383c81e8f4e4fdd31259e47605de5f00f
parent6054036fbce7b2b9fda62bd3e15aff3fc2c40e84
parent1461aee88ab8899f690571349fee28beecce3cfa
Merge branch 'MDL-43996-master' of git://github.com/jethac/moodle