Merge branch 'MDL-36804-fix3' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 5 Apr 2013 08:43:43 +0000 (16:43 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 5 Apr 2013 08:43:43 +0000 (16:43 +0800)
commit8b8641876bade13e19b2d88e9267e00f2e612c41
treecaa86dfb8ffff4aa3b57f139b889cc27606fff37
parent31f2822a5ea717ba31ea8a10fe50fae9a6f3fdfb
parent9f014461db8b639a350088f6b378c357e126dd31
Merge branch 'MDL-36804-fix3' of git://github.com/damyon/moodle