Merge branch 'master' of https://github.com/vnwildman/gitmagic
commita424505ed75d73d7ea81805ef6bbb6edc1e83610
authorBen Lynn <benlynn@gmail.com>
Sat, 18 Feb 2012 03:07:05 +0000 (17 19:07 -0800)
committerBen Lynn <benlynn@gmail.com>
Sat, 18 Feb 2012 03:07:05 +0000 (17 19:07 -0800)
tree8e4d8546785069abc44491d880cb8451a505ed14
parentebf84a0d00b1f3d542e50c31f71b5180a58e7310
parentedb723c9f0d838003d865c2233a2c200e0d39eb0
Merge branch 'master' of https://github.com/vnwildman/gitmagic