This way, the information remains valid after a split. For clients on TS5 servers, the nick is used; this is not much of a problem because these are on pseudoservers and not assumed to change nick much at all.
+ branches/release-2.1 -> 2.2 base + 3.0 -> branches/cxxconversion + backport some immediate 3.0 functionality for 2.2 + other stuff