Commit Graph

2 Commits

Author SHA1 Message Date
Uli Schlachter
4324d5ff02 Merge branch 'master' of https://github.com/pfn/znc
Conflicts:
	modules/extra/away.cpp

Signed-off-by: Uli Schlachter <psychon@znc.in>
2011-05-21 13:58:41 +02:00
Alexey Sokolov
5ece00f168 Don't confuse people with away module. 2011-04-25 09:44:52 +07:00