moving and modifying code so that the number of public or protected material gets reduced quite a lot
Authored by: vsp_nagel 2014-12-30
Parent: [r31628]
Child: [r31630]