Merge branch 'MDL-41993-master-fix1' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 9 Oct 2013 22:36:30 +0000 (09:36 +1100)
committerMarina Glancy <marina@moodle.com>
Wed, 9 Oct 2013 22:36:30 +0000 (09:36 +1100)
commit9e4561b2f2b5600e131df13da9b57950cc88b3c4
tree4b925b3047b47e40a3fa6dd40cf35a70d11e0395
parent2dc15b1011f26a161a9d0a3c3451e6668993f4ce
parent103ba42d846dfe9d9f9867ae9c0242c170be81c2
Merge branch 'MDL-41993-master-fix1' of git://github.com/damyon/moodle