Merge branch 'MDL-43197-master-2nd' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 05:25:32 +0000 (13:25 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 05:25:32 +0000 (13:25 +0800)
commitdd924ea9dbc620d2df947e8183387453fcb0ad74
tree2fa7284bfc4bbc91bbd94437bc096f89ae45c4ab
parent9fb3fdd75f2165ba7b75c2946bb56bdbd8bbf0c7
parentabbee05eb3503cf2b6aa99619f3028522efd6b32
Merge branch 'MDL-43197-master-2nd' of git://github.com/FMCorz/moodle