sane vim indentation defaults for new files
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)
Refined exuberant-ctags Scala extension

* Refined --regex-scala options to locate tags much more accurately
* Added case-objects and packages tag types
Merge pull request #93 from linkenneth/master

[Branch changed to 2.10.x] Fixed Emacs scala-mode indent (nil bug)
Added support for overrided class members
Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-master
Merge pull request #106 from retronym/merge/2.10.x-to-master

Merge/2.10.x to master
[emacs] Fix malformed header line

package.el requires a specific format for source files.

This subtle error therefore prevented MELPA from extracting a description when building packages of scala-mode.
Merge pull request #80 from gokcehan/patch-1

sane vim indentation defaults for new files
Merge pull request #108 from purcell/patch-1

[emacs] Fix malformed header line
Merge pull request #95 from liancheng/master

Refined exuberant-ctags extension for Scala
Merge pull request #105 from soc/misc

Miscellaneous fixes to the spec
Merge pull request #104 from soc/SI-4437

SI-4437 Specifies casts from null to primitive types
Merge pull request #103 from soc/SI-5205

SI-5205 Remove Octal literals
Merge pull request #102 from soc/SI-4918

SI-4918 Remove val in for comprehension value definitions
Merge pull request #100 from soc/SI-4648

SI-4648 Remove ScalaObject, adapt wording for AnyVals
Merge pull request #99 from soc/SI-4628

SI-4628 Remove primitive type aliases
Merge pull request #97 from soc/SI-265

SI-265 Disallow FP literals without digit after dot