Commit fc1f7d4f15ecc3f42dbde7fc0a30933cb89152bc

Ben Straub 2013-10-03T06:20:20

Merge branch 'development' into blame Conflicts: include/git2.h