Merge branch 'master' of https://github.com/matrig/gitmagic
authorBen Lynn <benlynn@gmail.com>
Thu, 27 Jun 2013 06:35:41 +0000 (23:35 -0700)
committerBen Lynn <benlynn@gmail.com>
Thu, 27 Jun 2013 06:35:41 +0000 (23:35 -0700)
commitf6feb907db7b548eeb49889bf41aa9b8b1da6b12
tree2433986a48a2c9aad85babd5de482c5ea38b8d0f
parentb50f77ea248bebb00aaaea670b121ebb621cb4aa
parentc71989bf4c8efe4949005c261dfe0fb98f6cf1fb
Merge branch 'master' of https://github.com/matrig/gitmagic