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

Multiple marks per nick
nickserv/enforce: make REGAIN login *you* rather than the target.

Previously, the change to make REGAIN identify as well would login the
user previously using the regained nick.
Merge pull request #377 from ilbelkyr/fix-regain-login

nickserv/enforce: make REGAIN login *you* rather than the target.
nickserv/enforce: Only login user to target account if they weren't already.

Also fixes a minor oversight in commit 9942cab where the user would not
be properly logged out.
Merge pull request #378 from ilbelkyr/really-fix-regain-login

nickserv/enforce: Only login user to target account if they weren't already.
Add channel output to flag lines in FLAGS command

A simple change to add the name of the channel to each flag line output for the FLAGS command. The advantage of this is that it makes it possible for a bot to be able to read the output of the command - without the #channel output it's not really possible to tell which channel a line in the flag response is concerning. With this change it is easy to key them - e.g. http://ur1.ca/i4hgr
protocol/inspircd: allow +J 5 as the comment promises
Merge pull request #379 from reality/patch-2

Add channel output to flag lines in FLAGS command