From: Florian Zeitz Date: Fri, 24 Jul 2009 20:06:02 +0000 (+0200) Subject: Merge branch 'master' of ssh://florob@babelmonkeys.de/home/florob/projects/socialXMPP X-Git-Url: http://cgit.babelmonkeys.de/?p=socialXMPP.git;a=commitdiff_plain;h=b11e25fa989a433439d4267c7e95f5e39a88e21b Merge branch 'master' of ssh://florob@babelmonkeys.de/home/florob/projects/socialXMPP --- b11e25fa989a433439d4267c7e95f5e39a88e21b