]> git.babelmonkeys.de Git - socialXMPP.git/commitdiff
Merge branch 'master' of ssh://florob@babelmonkeys.de/home/florob/projects/socialXMPP
authorFlorian Zeitz <florob@babelmonkeys.de>
Fri, 24 Jul 2009 20:06:02 +0000 (22:06 +0200)
committerFlorian Zeitz <florob@babelmonkeys.de>
Fri, 24 Jul 2009 20:06:02 +0000 (22:06 +0200)

Trivial merge