[qmpdclient: 6/6] Merge remote branch 'origin/f13/master'

[Julian Golderer]

commit e7d334251c5e9ff8e93034f26ea9ed40e3c9dad8
Merge: cd0ec7a 1fdb706
Author: Julian Golderer <j.golderer at novij.at>
Date:   Wed Sep 15 22:36:05 2010 +0200

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	qmpdclient.spec

 qmpdclient-link2X11.patch |   10 ++++++++++
 qmpdclient.desktop        |    2 +-
 qmpdclient.spec           |    8 +++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)
---