[libmusicbrainz4/f17: 7/7] Merge branch 'f18' into f17

[Rex Dieter]

commit f59af3bf8849f212d8d0b149a88748f98ee4edbd
Merge: 1abf3be adc947c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 7 12:13:41 2013 -0600

    Merge branch 'f18' into f17
    
    Conflicts:
    	libmusicbrainz4.spec
    	sources

 .gitignore                            |    1 +
 libmusicbrainz-4.0.3-xmlparsing.patch | 1370 +++++++++++++++++++++++++++++++++
 libmusicbrainz4.spec                  |   19 +-
 sources                               |    2 +-
 4 files changed, 1389 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index acd4389,acd4389..249cae8
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,4 @@@
  /libmusicbrainz-4.0.0.tar.gz
  /libmusicbrainz-4.0.1.tar.gz
  /libmusicbrainz-4.0.3.tar.gz
++/libmusicbrainz-4.0.3-clean.tar.gz