[pidgin-musictracker/f13/master: 2/2] Merge branch 'master' into f13

[Jan Klepek]

commit 8528668fd6f8c500cc00bdc58ee4218b016254a7
Merge: eec1abf 01ba78f
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sat Jan 8 16:47:51 2011 +0100

    Merge branch 'master' into f13

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