Merge branch 'master' into ELisp.
authorMatt Birkholz <puck@birchwood-abbey.net>
Thu, 8 May 2014 06:42:03 +0000 (23:42 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Thu, 8 May 2014 06:42:03 +0000 (23:42 -0700)
commitad282e48f6397daea01d90d11ba3e0943c38c22d
tree3ea141c4f20236a7018dfb3d2cef6a8b721948a7
parent13dc72d422f994905aeb68603ecba6377366c3a9
parent898345db5240fcfca1567725fa9779b1fecbe1c7
Merge branch 'master' into ELisp.