add an index_remove_bypath that removes conflicts, renamed add_from_workdir to match
Move all non-ascii test data to raw hex

This takes all of the characters in core::env and makes them use
hex sequences instead of keeping tricky character data inline in
the test.
add a git config, don't run crlf tests on non-win32
Merge pull request #1257 from ethomson/crlf_test_fix

add a git config, don't run crlf tests on non-win32
Merge pull request #1256 from arrbee/asciify-test-data

Move all non-ascii test data to raw hex
Merge pull request #1239 from ethomson/index_remove

add an index_remove_bypath that removes conflicts
Fix linking error caused by ddcb28a41f3774e26fc6ae0a7174a5565e4749ce.
Merge pull request #1258 from zcbenz/fix_index_remove_test

Fix linking error caused by ddcb28a41f3774e26fc6ae0a7174a5565e4749ce.
Fix really bad error handling in git_smart__negotiate_fetch
Merge pull request #1260 from phkelley/development

Fix really bad error handling in git_smart__negotiate_fetch
Fix compilation on OpenBSD
commit: don't include the LF in the header field value

When the encoding header changed to be treated as an additional
header, the EOL pointer started to point to the byte after the LF,
making the git__strndup call copy the LF into the value.

Increase the EOL pointer value after copying the data to keep the rest
of the semantics but avoid copying LF.
Parse commit time as uint64_t to avoid overflow

The commit time is already stored as a git_time_t, but we were
parsing is as a uint32_t.  This just switches the parser to use
uint64_t which will handle dates further in the future (and adds
some tests of those future dates).
Merge pull request #1265 from arrbee/parse-commit-time-as-uint64

Parse commit time as uint64_t to avoid overflow
Update clar to a80e7f30
Merge pull request #1266 from arrbee/update-clar

Update clar to a80e7f30
Handle packed peeled objects without trailing newlines

Fixes #1262
Merge pull request #1267 from libgit2/no-newline

Handle packed peeled objects without trailing newlines
A simple perf optimization in pack-objects.c
Fix gen_pktline format specifier for Win32