Bruno Cauet 00d5473187 Merge branch master into logging ... Conflicts: beetsplug/lyrics.py		2015-01-06 21:46:04 +01:00
..
__init__.py	Update multiple plugins: pass the logger around	2015-01-06 21:42:09 +01:00
genres-tree.yaml	lastgenre: Whitelist "humor" + "stand-up".	2015-01-06 19:50:00 +01:00
genres.txt	lastgenre: Whitelist "humor" + "stand-up".	2015-01-06 19:50:00 +01:00