Merge branch 'bug_592_dont_allow_default_parental_control_pin' into experimental
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 8 Oct 2010 12:05:13 +0000 (14:05 +0200)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 8 Oct 2010 12:05:13 +0000 (14:05 +0200)
commitc5bb2c5e40c592c9ceb0a6dabd8aefe6f2c2c86b
tree05bfc4d780c1850d7c82c5044a969b0b2b6d0b4a
parent294519be0af015446a07300d85fecc51dcb94b56
parent912a4c273438b3b7afb7cbbdcae3372ea9e489c2
Merge branch 'bug_592_dont_allow_default_parental_control_pin' into experimental