Merge branch 'patch-1' of https://github.com/ggray/gitmagic
commit980e048aff6cd4c619fd45d3b29c371eb13adf4d
authorBen Lynn <benlynn@gmail.com>
Tue, 13 Mar 2012 06:22:53 +0000 (12 23:22 -0700)
committerBen Lynn <benlynn@gmail.com>
Tue, 13 Mar 2012 06:22:53 +0000 (12 23:22 -0700)
tree606eacd14dcb2c59f33e52f92fb98a577b234a68
parented01bcf9c9b66c89fde3435361fc4be2deb59379
parenta03f61459946c7b8a452c1135391a4545cacf2c4
Merge branch 'patch-1' of https://github.com/ggray/gitmagic