Commit 549931679a77b280eb1f36afeda8930eb31d70f7

Ben Straub 2013-09-16T16:12:31

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