Update VERSION.
Merge branch 'stable'
Merge branch 'stable'

Conflicts:
	VERSION
Add .sass to .gitignore.
Merge branch 'stable'

* stable:
  Handle more possible Marshal errors in CacheStore#store and CacheStore#retrieve methods.
Merge branch 'stable'

* stable:
  Make hash and eql? public.
Merge branch 'stable'

* stable:
  No need to serialize the importer it is restored via the options when the cache is read.
Merge branch 'stable'

* stable:
  Bump version for release.
  zip($list1, $list2, ...) returns a new combined list of lists.
  index($list, $value) returns the index of $value within $list or false if not found.
  Update CHANGELOG for 3.1.2

Conflicts:
	VERSION
Merge branch 'stable'

* stable:
  Fix for strange paths like /path/to/project/./ and /path/to/project/../
  Add a test case to make sure that staleness checks across importers work correctly. Could not reproduce issue. Closes GH-114.
  Don't accidently interpret filenames with glob characters as glob characters during partial lookup.
Merge branch 'stable'

* stable:
  Add a logger object for better integration with frameworks.
Merge branch 'stable'

* stable:
  Update changelog
  Remove some commented out code.
Merge remote branch 'origin/master'
Merge branch 'stable'

* stable:
  Bump version for release.
  Clear out options before cache and restore them afterwards.
  Bump version for release.

Conflicts:
	VERSION
fixing grammar. (but the sentence seems to say that the sass files get compiled every time a request comes in: that can't be true, can it?  if that's not true, can you correct it?)
Converted color name mappings from html4 colors to x11 colors
Merge branch 'stable'

Conflicts:
	VERSION
Merge remote branch 'origin/master'
Revert "Clear out options before cache and restore them afterwards."

This reverts commit e813a76afbf383cec40f6ebb9fda2e6d91b2956f.

Conflicts:

	doc-src/SASS_CHANGELOG.md
Merge branch 'stable'

Conflicts:
	lib/sass/tree/debug_node.rb
	lib/sass/tree/if_node.rb
	lib/sass/tree/node.rb
Merge branch 'stable'

Conflicts:
	VERSION