13759 6786303 bonkel, Wed Feb 18 09:27:51 2015 +0100: fix merge
13758 a932b70 littlesat, Tue Feb 17 13:42:18 2015 +0100: ParentalControl: Clone more configs for backwards compatibility
13757 8597f22 littlesat, Tue Feb 17 11:47:13 2015 +0100: ParentalControl: Solve typo in comment line
13756 e021b3a littlesat, Tue Feb 17 11:41:30 2015 +0100: ParentalControl: Add more config clones (settuppin, settuppinactive)
13755 81913f5 littlesat, Tue Feb 17 10:55:01 2015 +0100: ChannelSelection: Remove a double imported function
13754 3900d27 littlesat, Tue Feb 17 10:11:16 2015 +0100: ParentalControl: Add configured config as clone from servicepinactive