zikula/core — comment on commit 3bd065ce085cee100a1063de79be5a8bc9c02af6
File:  line 0
By drak:

OK, just there were some merge conflicts affecting those classes and I
wanted a second pair of eyes to ensure I resolved the conflicts without
regression. Thanks :)