Merge branch 'master' into devel

Conflicts:
	configure.ac
	deadbeef.h
	plugins/mpgmad/mpgmad.c

1 files changed, 1 insertions, 1 deletions

diff --git a/deadbeef.h b/deadbeef.h
index 066abd35..d9c816f0 100644
--- a/deadbeef.h
+++ b/deadbeef.h
@@ -61,7 +61,7 @@ extern "C" {
 // 0.1 -- deadbeef-0.2.0
 
 #define DB_API_VERSION_MAJOR 0
-#define DB_API_VERSION_MINOR 4
+#define DB_API_VERSION_MINOR 5
 
 #define DB_PLUGIN_SET_API_VERSION\
     .plugin.api_vmajor = DB_API_VERSION_MAJOR,\