Merge branch 'MDL-40493-master-fix1' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 09:01:10 +0000 (17:01 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 09:01:10 +0000 (17:01 +0800)
commitc1636aea88582f0b06667245bae05d22be97a067
tree6fe0f1c8b236f0e91f3edbb6d49159ddf2299cb6
parent117111b78b6c4b5969ac15e3f5fb8dd7ce98d4ee
parent6e4dcb9a47c041925d871725b06d05b1c7bf8b52
Merge branch 'MDL-40493-master-fix1' of git://github.com/damyon/moodle