Add timsort to std/sort
Fix timsort to use updated vec::reserve
Put function argument last in sort function. Fixes #3265.
Remove trailing whitespace
Switch order of merge_sort arguments in some benchmarks
Export timsort
Add a simple testsuite for timsort
Make local variables and methods use underscores not camel case
Add cleanup code so the the array remains in a valid state if a comparison fails
Backup changes before pull from incoming
Merge remote-tracking branch 'original/incoming' into incoming

Conflicts:
	src/libstd/json.rs
	src/libstd/sort.rs
Fix my merge
Get tim_sort working, add test for double-freeing elements in tmp
Finish up tests, uncomment when ICE is fixed.
Remove debug info
Add a test to check that badly written Ord impl do not cause double frees
Merge remote-tracking branch 'original/incoming' into incoming
libcore: add a str::with_capacity to match the fn in vec
rustc: fix size computation of structs for the FFI

It didn't take alignment into account.

Fixes #3656.
Conditional usage of LLVM DebugFlag

DebugFlag is conditionally exported by LLVM in llvm/Support/Debug.h
in-between an #ifndef NDEBUG block; RustWrapper should not
unconditionally use it. This closes #3701.

Signed-off-by: Luca Bruno <lucab@debian.org>