Merge branch 'MDL-45382-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 5 May 2014 02:35:28 +0000 (10:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 5 May 2014 02:35:28 +0000 (10:35 +0800)
commit7da3113b7b77f03ab363770e9f7d04ae2f7468f5
tree113e71a79c1ad3744a901161aec9852acd24d34d
parenta128a24fcaf401a30c5ecb30d2ecbb365f788a45
parent16c6440dcb41d0bfd28298be238c0d1c7b8dcf75
Merge branch 'MDL-45382-master' of git://github.com/FMCorz/moodle