Merge https://github.com/lordofbikes/gitmagic
commite231ab2216ea0a55d0cb3da736c8f0e84feda988
authorBen Lynn <benlynn@gmail.com>
Tue, 12 Jul 2011 04:44:33 +0000 (11 21:44 -0700)
committerBen Lynn <benlynn@gmail.com>
Tue, 12 Jul 2011 04:44:33 +0000 (11 21:44 -0700)
tree3ba2d9045344b75d741488fbcc44ed62809bc1ee
parent4b9befa8f8dd69d83e7eb178f9d06bba604288e6
parent12b51e14313a9688ca92c8a1e7179fe85dc2e664
Merge https://github.com/lordofbikes/gitmagic