Merge from trunk
commit8e83e360f6602fb5a8405994d4415acb5aa78564
authorStefan Monnier <monnier@iro.umontreal.ca>
Wed, 11 Apr 2012 15:07:00 +0000 (11 11:07 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Wed, 11 Apr 2012 15:07:00 +0000 (11 11:07 -0400)
treeee09c50beca57a3084e87f98106d8ebfde941f67
parentdcc2857bc3dca1f8b055e8d795dc61933b71d7a6
parenta638d14e3da897677666090679a487fac762ae9d
Merge from trunk
sml-mode.el