Merge branch 'master' of git@github.com:elliottcable/ratmaster
commit34a9d0ca6ba03f7ccf25bd45e59f7ed92d837955
authorelliottcable <git@elliottcable.name>
Mon, 9 Mar 2009 19:25:55 +0000 (9 11:25 -0800)
committerelliottcable <git@elliottcable.name>
Mon, 9 Mar 2009 19:25:55 +0000 (9 11:25 -0800)
tree294237d65249c4e34a4ff7c8c7d558fcb72298b9
parent172fac225e0f247a63f543a80507bff8af60220e
parent9c769ef574a41b9157a0c3d88ab5fe933c91947f
Merge branch 'master' of git@github.com:elliottcable/rat

Conflicts:
Rakefile
Rakefile