Merge branch 'bug_607_parental_control_fix' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 2 Nov 2010 19:57:22 +0000 (20:57 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 2 Nov 2010 19:57:22 +0000 (20:57 +0100)
commit00d4f213c39e0ddffa2d0353af8cf65e77f8f709
tree10046b9b6abb7fa5f5d6e63097fa1b6ffb7bced1
parent6ffeb78ed56b36199450bc8dc585c98f7234e600
parent3c14624fb6631feb91ac28c102027fb9bbc79b7a
Merge branch 'bug_607_parental_control_fix' into experimental