The same procedure as last year, Miss sophie?
Same procedure as every year, James.
Merge pull request #268 from Un1matr1x/2013

2012 is over!
modules/sasl.cpp: Description line for DH-BLOWFISH

Added a description to the output for DH-BLOWFISH SASL mechanism.
Merge pull request #281 from TheLordOfTime/master

Modify modules/sasl.cpp to have a DH-BLOWFISH mechanism description
It's 2013 now (few modules were forgotten :P)
Use CModule::ExpandString
Really disable charset module if iconv is not found.

On some systems CHARSET variable is set...

Thanks to Hoss for reporting it
Don't lose dlerror() message.

Some weird systems seem to use dl functions while doing std::string
concatenation...

Thanks to Hoss for reporting it
Fix one more case of dlerror(), if it returns NULL after error.
controlpanel.cpp: Fix bug for "Disconnect" help

This fixes a bug in which providing empty data for the 'disconnect' command for controlpanel will return the 'reconnect' command's syntax help, which can confuse users.
A bit more consistency bewteen Del* and Rem*

Thanks to Kult for reporting this
Merge pull request #294 from TheLordOfTime/master

controlpanel.cpp BugFix: Empty 'disconnect' command returns 'reconnect' syntax help
controlpanel.cpp: Increases general verbosity of command results.
controlpanel.cpp: Standardize error wordings

When a network cannot be found for a user, and where a command will output an error under such circumstances, use similar wording in each message.
Show password in --makepass in new format
Merge branch 'master' of github.com:znc/znc
controlpanel.cpp: Fixed a Fail to Compile error introduced in prior commit.
Fix PartyLine so that forced channels may not be left at all - users will be rejoined at once.
Merge commit 'refs/pull/295/head' of github.com:znc/znc
Catch as references