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)
commitc48464988da6eaee534f934c73f438e18eccf144
tree95057d84a5e8b527572925bba271481b80943663
parentce0b1164e61f2372d46deb16fd1320c1783125a6
parentc04c8044c2f04d8db1d7987cc5cb181c03f9d7df
Merge pull request #304 from danvk/merge-hairline

Merge mainline changes needed for hairlines & super-annotations