[vdr/f12/master: 9/9] Merge branch 'f13' into f12

[Ville Skyttä]

commit 4edb71b63c133b961430782800850a7f673b6f53
Merge: d33daed 5cd8b18
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Sep 5 22:23:37 2010 +0300

    Merge branch 'f13' into f12

 vdr-1.6.0-man-section.patch |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---