Merge git://github.com/blynn/gitmagic
commit3ab2ebc95f0d73954c5a9d79ae7983762e1792e5
authorBen Lynn <benlynn@gmail.com>
Sat, 18 Feb 2012 03:10:11 +0000 (17 19:10 -0800)
committerBen Lynn <benlynn@gmail.com>
Sat, 18 Feb 2012 03:10:11 +0000 (17 19:10 -0800)
tree35cfae1ed65743a988134e0dd6b0141b447a734a
parenta424505ed75d73d7ea81805ef6bbb6edc1e83610
parentee286b416e00e0e99e2d9e19fa77f66752659216
Merge git://github.com/blynn/gitmagic