Merge pull request #304 from danvk/merge-hairline
authorDan Vanderkam <danvdk@gmail.com>
Sun, 16 Nov 2014 23:49:25 +0000 (18:49 -0500)
committerDan Vanderkam <danvdk@gmail.com>
Sun, 16 Nov 2014 23:49:25 +0000 (18:49 -0500)
Merge mainline changes needed for hairlines & super-annotations


Trivial merge