Merge branch 'MDL-37621-master-fix2' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 12 Jun 2013 07:22:22 +0000 (17:22 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 12 Jun 2013 07:22:22 +0000 (17:22 +1000)
commit8ea7d3a2dbe4d3249cca0f17d2d62a13cbd54512
treede9e11f472fab3ede09e7dd4bcc1c54485ac68ac
parent128e9315d6f87ebe20207f07ad5cbf17e292f52d
parentc7cd8d9c8443515b7532a311714b6fa1a939e187
Merge branch 'MDL-37621-master-fix2' of git://github.com/damyon/moodle