Merge branch 'master' of https://github.com/matrig/gitmagic
authorBen Lynn <benlynn@gmail.com>
Wed, 5 Jun 2013 05:24:44 +0000 (22:24 -0700)
committerBen Lynn <benlynn@gmail.com>
Wed, 5 Jun 2013 05:24:44 +0000 (22:24 -0700)
commit6a5a4ba6ede17db7437e83f1a19452a21f81a6b0
treeb048147e68bcf42bf55c387dc795fd87729405df
parent223287079d3b568f4ca12fed152b860844b3c78b
parent313642f74a228b21afb18b358afc23c7f5165300
Merge branch 'master' of https://github.com/matrig/gitmagic