Merge branch 'MDL-36804-master-fix2' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 5 Apr 2013 08:00:35 +0000 (16:00 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 5 Apr 2013 08:00:35 +0000 (16:00 +0800)
commit31f2822a5ea717ba31ea8a10fe50fae9a6f3fdfb
tree7b96a47053429e1abaa934fe84017174879fcc36
parentc39896e85d06c1a5c4850fdc8b9b574a363ccfb7
parente7af1926064c22e866859721eefcb2be947dd27c
Merge branch 'MDL-36804-master-fix2' of git://github.com/damyon/moodle