Commit d9f7581443bd786e7d17532f6678efd2ee77c26f Parent de1e28217f0da80b928bca0ca09541c0401314ee Author John MacFarlane <jgm@berkeley.edu> Date Mon, 29 Sep 2014 22:59:46 -0700 Merge branch 'master' into newemphasis Conflicts: Makefile js/stmd.js