[vdr-skinnopacity/f20: 4/5] Merge branch 'master' into f20

[Martin Gansser]

commit f4f7722fb5ed05343d4ecd5e6b677f3841969623
Merge: d679c43 7d80613
Author: Martin Gansser <mgansser at alice.de>
Date:   Sat Feb 1 16:00:42 2014 +0100

    Merge branch 'master' into f20

 .gitignore |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---