Load TXXX frames that conflict with Picard tags into the ~id3:TXXX namespace
Merge branch 'master' of github.com:musicbrainz/picard into mwiencek-master
Fix error when there are no tags (filename is not a local variable)
Create a constant with the AcoustID hostname
Handle Unicode apostrophe as well

http://forums.musicbrainz.org/viewtopic.php?pid=20715
Merge branch 'master' of github.com:musicbrainz/picard
Fix logical conflict (different fix from bitmap)
Rename and preserve tags containing # so they can be used
Add basic collections management support (PICARD-84)

Adds a "Collections" submenu to the album context menu.

The code is mostly based on my GSoC branch from a couple years ago,
but I made some heavy changes.
Merge branch 'master' of github.com:musicbrainz/picard
fixup! Rename and preserve tags containing # so they can be used
Merge branch 'master' of github.com:musicbrainz/picard
If option "caa_approved_only" is set, skip non-approved images asap.
Remove forgotten debug print
Merge branch 'optim_caa_approved' of https://github.com/zas/picard
CAA downloader: fix CAA download of 'unknown' type images

When no type is set for an image, CAA is returning an empty list for types.
But Picard user has no way to specify he wants to also download images
of unknown type using the option 'Download only images of the following types'.

I added a special type named 'unknown' and modified _caa_json_downloaded() to
handle this case.
CoverArtBox: fix incorrect extension matching (.png)

Code was incorrectly setting 'image/png' type for file 'img.png.jpg'
Merge remote-tracking branch 'zas/caa_image_unknown'
CoverArtBox: preserve cover art aspect ratio on drawing

Cover is now placed correctly over the cover shadow, aspect ratio
is preserved.
Handle error responses from AcoustID

http://tickets.musicbrainz.org/browse/PICARD-391