Merge branch 'bug_592_dont_allow_default_parental_control_pin' into experimental
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 8 Oct 2010 11:57:43 +0000 (13:57 +0200)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 8 Oct 2010 11:57:43 +0000 (13:57 +0200)
commit294519be0af015446a07300d85fecc51dcb94b56
treece9627ae4040b49d3e7180df27e190902672e027
parent92f3d930521177990d62d8e384b57dbf9d5b75d7
parent8e5d9f980781cf53d82f11f774a6987e8012e6d8
Merge branch 'bug_592_dont_allow_default_parental_control_pin' into experimental