Merge branch 'master' of git://github.com/Mab879/Chakora-botserv
authorMatthew Burket <Matthew@assignitapp.com>
Fri, 17 Dec 2010 02:51:36 +0000 (20:51 -0600)
committerMatthew Burket <Matthew@assignitapp.com>
Fri, 17 Dec 2010 02:51:36 +0000 (20:51 -0600)
commit399afb8120fbb5ba3b0e1846d827abb7e8abff1f
treef098fdadd7b35173df8343ce7ee3b31ccbbce12c
parentcbeefbad10c10a900076fe0ae19d710adb49f5ab
parentb189d1c4eb37464671939331e116a41c53abb9ef
Merge branch 'master' of git://github.com/Mab879/Chakora-botserv

Conflicts:
etc/chakora.conf.example