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

@tfotis Could you review the merge - there were a few conflicts I had to resolve. @craigh can you check the category classes please?