* Prepare 3.3.0-SNAPSHOT builds

* Merge branch 'master' into stable-3.2

* Implement rebase.autostash

* CLI status should support --porcelain

* More helpful InvalidPathException messages (include reason)

* Fix IgnoreRule#isMatch returning wrong result due to missing reset

* Fix exception on conflicts with recursive merge

* Add pgm test for checkout of existing branch with checkout conflict

* Fix broken symbolic links on Cygwin.

* Do not allow non-ff-rebase if there are uncommitted changes

* Manage CheckoutConflictException in pgm

* Fix handling of file/folder conflicts during a checkout

* Mention null return in Javadoc of Config#getString

* Fix applying stash on other commit

* Use static factory methods instead of overloaded constructors

* Break up GCTest to run in parallel
* Modify T0004_PackReaderTest to use existing pack
* Move SampleDataRepositoryTestCase to org.eclipse.jgit.test
* Support running from JARs in JGitTestUtil

* Cache SimpleDateFormat in GitDateParser per locale

* Fix FIXUP error for blank lines in interactive rebase

* Fix parsing Rebase todo lines when commit message is missing

* Add close() method to API

* Update Jetty to 7.6.14.v20131031

* Don't delete .idx file if .pack file can't be deleted

* Document that path parameters should use '/' as separator

* Improve Javadoc for typeHint parameter

* Do not update the ref hot bit when checking isIndexLoaded

* Prepare post 3.2.0-m3 builds

* JGit v3.2.0.201311130903-m3

* Update to Ant 1.9.2

* Add missing @since tags

* Add uses directives to ensure OSGi wires jgit bundles correctly

* Introduce Kepler and Luna target platform

* Update build to use Tycho 0.19

* [findBugs] Remove nonsense call

* Remove unnecessary @SuppressWarnings("null")

* Grant access to internal jgit package to org.eclipse.jgit.junit

* Remove duplicate package export

* Don't import non-existing package org.eclipse.jgit.java7

* Interactive Rebase: Do actions if there were conflicts

* Rebase interactive should finish if last step is edit

* Add additional RebaseResult for editing commits
* Add Squash/Fixup support for rebase interactive in RebaseCommand

* Use absolute paths for file:// URIs in tests
* Use getPath() in FileResolverTest
* Extract protocol constants to a common class
* Move repeat() to utility class for tests
* Remove hardcoded target/trash from test cases
* Remove dependency on StatusCommandTest
* Remove dependency on DiffFormatterReflowTest
* Remove unnecessary import of BaseConnection in MessageWriter

* Declare that org.eclipse.jgit.transport uses com.jcraft.jsch

* Also use MockSystemReader in GitDateParserBadlyFormattedTest

* testMaliciousPathEmpty fails on Windows

* Revert "Close unfinished archive entries on error"

* Enable to prepare interactive rebase and then start it explicitly

* Parse commitId and shortMessage of a commented out line in rebase todo

* Enhance reading of git-rebase-todo formatted files

* Enhance RepositoryTestCase.commitFile() to work on empty repository

* Add missing resources from source.. in build.properties