Merging branches/0.2/@r857 with trunk
authorMarcus Eggenberger <egs@quassel-irc.org>
Fri, 23 May 2008 15:28:28 +0000 (15:28 +0000)
committerMarcus Eggenberger <egs@quassel-irc.org>
Fri, 23 May 2008 15:28:28 +0000 (15:28 +0000)
commitc79539bee8761bcabe057d8d72594d16da24528f
treedb6a84efc38fcc616e90418ebadc68886b200d3f
parent920feae12b62b749299014ce85241165e09b7f4b
Merging branches/0.2/@r857 with trunk
src/common/ircuser.cpp
version.inc