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
Merge branch 'master' of https://github.com/sampsyo/beets
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.
Merge pull request #235 from KraYmer/inline-doc

Update inline plugin doc by providing an example about how to define a f...
Add functions needed for ScriptCollection Support in Tomahawk
Merge pull request #240 from xhochy/feature/tomahawk-scriptcollections

Add functions needed for ScriptCollection Support in Tomahawk
use standard query API for album-by-artist (#240)
- changes to mediafile.py. Provides a delete method which allows the user
  to remove all audio metadata from the mutagen call "delete"

  example : mediafileobject.delete()