Merge branch 'master' of https://github.com/Pinkilla/gitmagic
authorBen Lynn <benlynn@gmail.com>
Tue, 29 Oct 2013 06:14:16 +0000 (23:14 -0700)
committerBen Lynn <benlynn@gmail.com>
Tue, 29 Oct 2013 06:14:16 +0000 (23:14 -0700)
commitc741cc048bb500c1bb7cfacbab8ece83a3ff8b80
tree5227d3d968c3489fdb1cf03e28f86de45a8dd66a
parent8e5cd6218b91833ab12971ad0d1b7d93f18be248
parent839a9327a1ddfcc1afb6fed41b244aa4cbb8f110
Merge branch 'master' of https://github.com/Pinkilla/gitmagic