c648887bbbec424c7377a6e3bd6814ef9cdaf117 02ab43b012ec2b7c58cfbb827a804aa7152eae5b Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/f10e18dca92fdbfaf97928b8944eacf2082925b7 f10e18dca92fdbfaf97928b8944eacf2082925b7 2008-06-07T04:54:50-07:00 2008-06-07T04:54:50-07:00 Merge branch 'master' of scm@67.207.136.60:instantsocial 69b9d3e60f68901c2aedf6e3a133a26a2386cec7 Michael Hartl michael@michaelhartl.com