[soundconverter/f14: 12/12] Merge branch 'f15' into f14

Fri Jul 15 15:03:15 UTC 2011

commit a075849cfc326f2ef45f391f3a5dc6570d556846
Merge: 9845e43 a324f4c
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Jul 15 17:02:46 2011 +0200

    Merge branch 'f15' into f14
    
    Conflicts:
    	soundconverter.spec

 .gitignore                                      |    1 +
 soundconverter-1.5.3-artist-albums.patch        |   17 ----
 soundconverter-1.5.3-cli-batch.patch            |  101 -----------------------
 soundconverter-1.5.3-target-folder-is-uri.patch |   12 ---
 soundconverter-1.5.4-gst-profile-lang.patch     |   46 ++++++++++
 soundconverter-1.5.4-markup_escape_text.patch   |   16 ++++
 soundconverter.spec                             |   63 +++++++++++----
 sources                                         |    2 +-
 8 files changed, 111 insertions(+), 147 deletions(-)
---