projects / vuplus_dvbapp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6e0a1f 912a4c2)
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)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.