[librsvg: 3/3] Merge branch 'fontSize' into 'master'

[Federico Mena Quintero <federico src gnome org>]

commit 9d2f41f7cee3939aafbde30329800786f7493438
Merge: 6b730799 bf2f8689
Author: Federico Mena Quintero <federico mena gmail com>
Date:   Mon Jul 9 10:05:37 2018 +0000

    Merge branch 'fontSize' into 'master'
    
    Fix #310 - correct font-size of non-standard dpi
    
    Closes #310
    
    See merge request GNOME/librsvg!92

 CONTRIBUTING.md                                    |   2 +-
 rsvg_internals/src/text.rs                         |   3 +-
 .../reftests/bugs/310-font-size-at-48dpi-ref.png   | Bin 0 -> 5818 bytes
 .../reftests/bugs/310-font-size-at-48dpi.svg       |  62 +++++++++++++++++++++
 tests/rsvg-test.c                                  |   5 +-
 5 files changed, 68 insertions(+), 4 deletions(-)
---