Automatic merging of commits that would change history order: ------------------------------------------------------------ revno: 1282.1.2 committer: Daniel Lee Harple <leeharple@gmail.com> branch nick: 0.2.8-armagetronad-work timestamp: Mon 2011-07-18 21:46:08 -0400 message: Added ENCODING ladderlog event. ------------------------------------------------------------ revno: 1282.1.1 committer: Daniel Lee Harple <leeharple@gmail.com> branch nick: 0.2.8-armagetronad-work timestamp: Wed 2011-07-13 00:49:08 -0400 message: WHITELIST_ENEMIES_USERNAME requires authentication support to be enabled