Merge https://github.com/nanjj/gitmagic
commitab47155a33e17d5f214043450d8c26d28e6f2e78
authorBen Lynn <benlynn@gmail.com>
Mon, 7 Mar 2011 09:57:20 +0000 (7 01:57 -0800)
committerBen Lynn <benlynn@gmail.com>
Mon, 7 Mar 2011 09:57:20 +0000 (7 01:57 -0800)
tree3acb0262e4aade570063b3b8e95f7567baac32f8
parent3177fe91c03b913c49d9ba3990c70ce28f88f5fe
parent8ab61aab4b58766966367f93ce6ee15c52ff2282
Merge https://github.com/nanjj/gitmagic