Merge branch 'bug_607_parental_control_fix' into 3.0
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 3 Nov 2010 16:40:59 +0000 (17:40 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 3 Nov 2010 16:40:59 +0000 (17:40 +0100)
commitf7af4f251d28b270925a98c7f258659a0b3b0c3b
treef36aa08d965e5698d973971f1c3ee9e8cc80f6f7
parentbe47592d17cbd1e0d64a2c61c2b6f73614f5b448
parent1a7cc7d5f04ae8bcf6ae879f1cfc11c9072a95d7
Merge branch 'bug_607_parental_control_fix' into 3.0