Merge branch 'master' of https://github.com/matrig/gitmagic
authorBen Lynn <benlynn@gmail.com>
Sat, 15 Jun 2013 04:20:40 +0000 (21:20 -0700)
committerBen Lynn <benlynn@gmail.com>
Sat, 15 Jun 2013 04:20:40 +0000 (21:20 -0700)
commitb50f77ea248bebb00aaaea670b121ebb621cb4aa
treec145f60329442c5b03e2b61ac629783b8c01ff92
parent6a5a4ba6ede17db7437e83f1a19452a21f81a6b0
parent7df3ff8edbe9997d59410178f2466378c21a1db2
Merge branch 'master' of https://github.com/matrig/gitmagic