David Sansome e718065aeb Merge branch 'master' into breakpad
Conflicts:
	src/core/commandlineoptions.h
	src/core/utilities.cpp
	src/covers/amazoncoverprovider.cpp
2013-08-04 18:05:14 +10:00
..
2013-05-17 16:33:35 +02:00
2012-01-22 14:35:52 +00:00
2011-07-23 20:08:33 +01:00