[andrew ~/kythera] $ git pull
remote: Counting objects: 31, done.
remote: Compressing objects: 100% (10/10), done.
remote: Total 20 (delta 6), reused 20 (delta 6)
Unpacking objects: 100% (20/20), done.
From git://github.com/rakaur/kythera
   1b56c2c..ff53644  master     -> origin/master
Updating e605c59..ff53644
Fast-forward
 db/migrations/001_start.rb   |   15 ++++++++++
 lib/kythera/database/user.rb |   62 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 0 deletions(-)
[andrew ~/kythera] $ git log
commit ff536446b0e6d6f26c217fa6c9adf8876eda1809
Merge: b0391b9 e605c59
Author: Eric Will <rakaur@malkier.net>
Date:   Tue Jun 28 11:37:53 2011 -0700

    Merge pull request #25 from andrew12/master

    Implement UnrealIRCd's protocol

commit b0391b9951133b79064b58919cabba81cc4b7e96
Author: Eric Will <rakaur@malkier.net>
Date:   Tue Jun 28 13:36:34 2011 -0500

    Minor style changes

commit 3d005947c58a22c0dd643aaf9f5c9444f4a355ad
Merge: 1b56c2c 7ca900c
Author: Eric Will <rakaur@malkier.net>
Date:   Tue Jun 28 11:31:38 2011 -0700

    Merge pull request #22 from sycobuny/master

    Add UserFlag model

commit e605c59b22a3e3497b5304fca7d33893719fcdf9
Author: Andrew Herbig <goforit7arh@gmail.com>
Date:   Tue Jun 28 02:36:33 2011 -0400

    Fix Unreal's protocol up some more

    Call #to_s on everything in User#initialize

commit 43291dc684c8f20fe08d5b2e22b7f9faaaf3a1e5
Author: Andrew Herbig <goforit7arh@gmail.com>
Date:   Mon Jun 27 18:17:42 2011 -0400

    Implement UnrealIRCd's protocol and fix some things in TS6's. Closes #21.

commit 7ca900cd2ce63b5708f245fa65cb1b3ae565f3ef
Author: Stephen Belcher <sbelcher@gmail.com>
[andrew ~/kythera] $ git log | cat
commit ff536446b0e6d6f26c217fa6c9adf8876eda1809
Merge: b0391b9 e605c59
Author: Eric Will <rakaur@malkier.net>
Date:   Tue Jun 28 11:37:53 2011 -0700

    Merge pull request #25 from andrew12/master

    Implement UnrealIRCd's protocol

commit b0391b9951133b79064b58919cabba81cc4b7e96
Author: Eric Will <rakaur@malkier.net>
Date:   Tue Jun 28 13:36:34 2011 -0500

    Minor style changes

commit 3d005947c58a22c0dd643aaf9f5c9444f4a355ad
Merge: 1b56c2c 7ca900c
Author: Eric Will <rakaur@malkier.net>
Date:   Tue Jun 28 11:31:38 2011 -0700

    Merge pull request #22 from sycobuny/master

    Add UserFlag model

commit e605c59b22a3e3497b5304fca7d33893719fcdf9
Author: Andrew Herbig <goforit7arh@gmail.com>
Date:   Tue Jun 28 02:36:33 2011 -0400

    Fix Unreal's protocol up some more

    Call #to_s on everything in User#initialize

commit 43291dc684c8f20fe08d5b2e22b7f9faaaf3a1e5
Author: Andrew Herbig <goforit7arh@gmail.com>
Date:   Mon Jun 27 18:17:42 2011 -0400

    Implement UnrealIRCd's protocol and fix some things in TS6's. Closes #21.

commit 7ca900cd2ce63b5708f245fa65cb1b3ae565f3ef
Author: Stephen Belcher <sbelcher@gmail.com>
Date:   Fri Jun 24 00:02:07 2011 -0400

    Add UserFlag model for flag access levels and convenience methods in User.

commit 1b56c2c6502f58cb1f7b832a40b20e27b7ea51c5
Author: Eric Will <rakaur@malkier.net>
Date:   Wed Jun 22 23:17:04 2011 -0400

    Implement the start of the database stuff, including Database::User

    Add an initial Sequel migration
    Add rake tasks for Sequel migrations (migrate:auto, up, down, to)
    Add a special global for application states ($state[:bursting], etc)
    Add a copy of Ruby 1.9's securerandom.rb for 1.8 compatibility