[briancline/ircplanet] d09114: Fix bugs where existing deactivated glines/mutes w...

[nor...@github.com]

Branch: refs/heads/master
Home: https://github.com/briancline/ircplanet

Commit: d09114403818fcf2f56d73b28257dfb9b3ff54cc
https://github.com/briancline/ircplanet/commit/d09114403818fcf2f56d73b28257dfb9b3ff54cc
Author: Brian Cline <brian...@gmail.com>
Date: 2010-11-06 (Sat, 06 Nov 2010)

Changed paths:
M ChangeLog
M Operator/commands/addgchan.php
M Operator/commands/addgname.php
M Operator/commands/gline.php
M Operator/commands/mute.php

Log Message:
-----------
Fix bugs where existing deactivated glines/mutes weren't being updated in the database after being re-activated.

Commit: ac8074763bc103ddf83d61dbf439793a7436a046
https://github.com/briancline/ircplanet/commit/ac8074763bc103ddf83d61dbf439793a7436a046
Author: Brian Cline <brian...@gmail.com>
Date: 2010-11-06 (Sat, 06 Nov 2010)

Changed paths:
M ChangeLog
M Operator/commands/remgline.php
M Operator/commands/remgname.php
M Operator/commands/remmute.php

Log Message:
-----------
Resolve conflict in ChangeLog.