Multiple marks per nick
Merge pull request #376 from errietta/multimark2

Multiple marks per nick