Merge pull request #85 from adriaanm/2.10.x

2.10.x
Merge pull request #86 from adriaanm/2.10.x

enable s3 upload
scala indent fix from char-before to preceding-char (nil error)
Merge pull request #93 from linkenneth/master

[Branch changed to 2.10.x] Fixed Emacs scala-mode indent (nil bug)
Include doc/ subdir as-is, including doc/licenses/

`doc/scala-devel-docs` moved to `api/`, as the scaladocs
go to a different tar ball
Merge pull request #110 from adriaanm/docdir-all

Include doc/ subdir as-is, including doc/licenses/
Fixup for #110
Merge pull request #111 from adriaanm/docdir-all

Fixup for #110
Don't redistribute partest.
Merge pull request #112 from adriaanm/docdir-all

Don't redistribute partest.
Fix #121: remove redundant \

Looks like others do the same: https://code.google.com/p/ossbuild/source/browse/trunk/Main/GStreamer/Windows/Install/Setup/Complete.wxs?r=664#84