Merge branch '0.5'

Conflicts:
	CMakeLists.txt
	po/pt_BR.po
	po/ru.po
	src/winver.h

2 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index cd09a50e..d68e2eca 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -367,8 +367,8 @@ void ServerDialog::action(const gcn::ActionEvent &event)
     else if (event.getId() == "remove")
     {
         int index = mServersList->getSelected();
-        mServersList->setSelected(0);
         mServers.erase(mServers.begin() + index);
+        mServersList->setSelected(0);
 
         saveCustomServers();
     }
diff --git a/src/main.h b/src/main.h
index 38ab6337..3a644100 100644
--- a/src/main.h
+++ b/src/main.h
@@ -55,7 +55,7 @@
 #elif defined WIN32
 #include "winver.h"
 #elif defined __APPLE__
-#define PACKAGE_VERSION "0.5.0"
+#define PACKAGE_VERSION "0.5.1"
 #endif
 
 #ifdef PACKAGE_VERSION