Merge remote branch 'remotes/origin/bug_592_dont_allow_default_parental_control_pin'
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 14 Oct 2010 11:32:46 +0000 (13:32 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 14 Oct 2010 11:32:46 +0000 (13:32 +0200)
commitd632d90b89b9da41fc164f99ca5dde03c4608550
treef1a6718dd276d298ee428322ffb4060aecac8175
parentd6e0a1fad0346bb51293c198c3ced7bc4cf44217
parent912a4c273438b3b7afb7cbbdcae3372ea9e489c2
Merge remote branch 'remotes/origin/bug_592_dont_allow_default_parental_control_pin'