Merge from trunk
commit954b1da166e1ca97c1c08c386a5e6ad92e0db071
authorStefan Monnier <monnier@iro.umontreal.ca>
Wed, 11 Apr 2012 16:46:36 +0000 (11 12:46 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Wed, 11 Apr 2012 16:46:36 +0000 (11 12:46 -0400)
treef6afefc4ca360430e42465c4ddeb24c9f5d86a39
parent2ccab7d3e71ace52f7d15e33a6a0d37070cd6fcb
parenta06658ac0b3209c6dc91ac365de7e4c6f785d120
Merge from trunk
sml-mode.el
sml-oldindent.el