Merge https://github.com/lordofbikes/gitmagic
commit5a140f76eb1e6287b95afa35bc083998a7a4f974
authorBen Lynn <benlynn@gmail.com>
Tue, 8 Mar 2011 08:04:21 +0000 (8 00:04 -0800)
committerBen Lynn <benlynn@gmail.com>
Tue, 8 Mar 2011 08:04:21 +0000 (8 00:04 -0800)
tree595ae37fcbec29d8aebe61ff0e3543a39e1fc861
parentc7ed234dac9b3789abd064d592f91dbb15eb2d63
parent370dc18e924cb6b38d833f87bedd9f4f39d2074b
Merge https://github.com/lordofbikes/gitmagic