Files
znc/modules/adminlog.cpp
Alexey Sokolov 0d8bb7e597 Merge branch '1.6.x'
Conflicts:
	modules/cyrusauth.cpp
	modules/keepnick.cpp
	modules/notes.cpp
2015-10-30 14:56:28 +00:00

5.7 KiB