replace \r by \n
Merge branch 'lyrics'
Merge branch 'master' of https://github.com/sampsyo/beets
Merge branch 'master' of https://github.com/sampsyo/beets
Merge branch 'master' of https://github.com/sampsyo/beets
Added Discogs search plugin.
Merge branch 'master' of https://github.com/sampsyo/beets
fix mbsync bug

This fixes a bug that only applied changes to the first item of an album
option to embed current album arts (closes #182)
invert new embedart switch (#182)

The default behavior now does what most people probably expect, which is to
run like the on-import handler for the embedart plugin.
version bump/changelog for #182
human-friendly error messages (#125)
one more error message (#125)
fixing things
Merge pull request #234 from duailibe/error_messages

Human-friendly error messages
changelog note for #234/#125
Merge branch 'master' of https://github.com/sampsyo/beets
Update scrub.rst

*autoscrub* option renamed to *auto*
Merge branch 'master' of https://github.com/sampsyo/beets
Update inline plugin doc by providing an example about how to define a field depending on 'path' attribute.