Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Add tests for the `importadded` plugin

The tests verifies that the `importadded` plugin updates added dates and
mtimes when importing:

* an album
* an album with file mtime preservation on
* singletons
* singletons with file mtime preservation on

It also verifies the the plugin doesn't update added dates when
re-importing:

* an album
* singletons
convert: copy album art when copying or transcoding.

Only implemented to work when matching albums instead of tracks (-a option).
Disabled by default in the configuration of 'convert'.

fix indentation.

Fix Travis nagging over indentation (hopefully).

Finally pep8 conforming.
`beet stats` output clarification (#1052)

Explicitly say that size calculation is approximate.
Merge pull request #1054 from silb/importadded-tests

Add tests for the `importadded` plugin
Tiny formatting tweaks (#1054)
Use assertAlmostEqual (#1054)

Rounding and then comparing could lead to some surprising sensitivity. This
uses a known-good approximate comparison.
Merge remote-tracking branch 'upstream/master'
Starting on freedesktop plugin.
convert: update documentation and add a trailing comma.
Merge pull request #1055 from alderz/convert_copy_album_art

convert: copy album art when copying or transcoding.
Changelog for #1055, fix #1050
Merge remote-tracking branch 'upstream/master'
fd plugin now runs on album_imported hook. also logs when album has no art.
Add doc page for freedesktop plugin.
Add freedesktop doc page to plugins index.
Add freedesktop doc page to plugins index, take two.
Fixed up config checking to make freedesktop plugin pass flake8.