Merge branch '1.6.x'

Conflicts:
	modules/cyrusauth.cpp
	modules/keepnick.cpp
	modules/notes.cpp
This commit is contained in:
Alexey Sokolov
2015-10-30 14:56:28 +00:00
11 changed files with 32 additions and 34 deletions
+1 -1
View File
@@ -61,7 +61,7 @@ public:
}
private:
unsigned int m_uiIndex;
unsigned int m_uiIndex = 0;
};
class CSASLMod : public CModule {