Merge branch 'MDL-39978' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 02:48:21 +0000 (14:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 02:48:21 +0000 (14:48 +1200)
commit018fc94211b5b8b85cae1615d7e342a53b4efd07
tree647a7ec8d5fb58a1c8537cbb4d5664a35b724991
parentbf0cdbcf8ae0a1a44a0dc2d6908dc081138747d7
parentea07b2d62201c0940bb14468c4720f010d35e969
Merge branch 'MDL-39978' of git://github.com/timhunt/moodle