[libmusicbrainz5/f17: 4/4] Merge branch 'f18' into f17

[Rex Dieter]

commit a092da7246ffd26e29545c97b38ab6a2f9492a21
Merge: e387f44 b1c7c59
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 7 11:51:11 2013 -0600

    Merge branch 'f18' into f17
    
    Conflicts:
    	.gitignore
    	libmusicbrainz5.spec

 .gitignore           |    1 -
 libmusicbrainz5.spec |    5 +----
 2 files changed, 1 insertions(+), 5 deletions(-)
---