Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice into testing

e7c4f759 · Max-Wilhelm Bruker · 266e7376 · e1e43917 · e7c4f759
Commit e7c4f759 authored Mar 15, 2010 by Max-Wilhelm Bruker
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -135,4 +135,4 @@ AuthenticationResult Servatrice::checkUserPassword(const QString &user, const QS
 		return UnknownUser;
 }
-const QString Servatrice::versionString = "Servatrice 0.20091113";
+const QString Servatrice::versionString = "Servatrice 0.20100309";