Merge branch 'MDL-41767-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 01:57:15 +0000 (09:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 01:57:15 +0000 (09:57 +0800)
commit89ede7e12dd2d34ba0fad4f0781f980fff9e0b8c
treebfd67ce9a8e36066698d7e951db66aa02ab9c45f
parentec4c8161a4c3b6f8cbaf093bb5d3db3b4cc36211
parent22c5c6e627672d0586b9c3a05cf38c8673c5705a
Merge branch 'MDL-41767-master' of git://github.com/FMCorz/moodle