billy@metapod:~/src/sexpbot$ git log
commit 5346418e11beb316e69f3e2fceece412b7d90103
Merge: a3e9cea d8555b8
Author: William Meister <wmeister86@gmail.com>
Date:   Thu Apr 29 13:50:05 2010 -0400

    Merge commit 'origin/master'

    Conflicts:
        .sexpbot/info.clj

commit a3e9cea384000296905876b3e7c16a91ffe3192e
Author: William Meister <wmeister86@gmail.com>
Date:   Thu Apr 29 13:48:34 2010 -0400

    no clue

commit d8555b8745e3d3d1422139443f0a383c0cbc35c7
Author: Rayne <DiscipleRayne@gmail.com>
Date:   Thu Apr 29 12:06:30 2010 -0500

    Added a reload command.

commit c96231f1a7534febc39535df3c849b8c164f3b66
Author: Rayne <DiscipleRayne@gmail.com>
Date:   Thu Apr 29 11:38:32 2010 -0500

    * .sexpbot/info.clj: More config problems fixed.

commit f67471252d618ad4bf7436e379db7501b9effda8
Author: Rayne <DiscipleRayne@gmail.com>
Date:   Thu Apr 29 11:33:06 2010 -0500

    * .sexpbot/info.clj: Small configuration error. Fixed.