[gtk: 2/2] Merge branch 'master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit d564e397e24af9979cdab0c5744e314c02b4f2f3
Merge: 656f67eeb7 b9ea25c25c
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Feb 15 03:07:54 2018 +0000

    Merge branch 'master' into 'master'
    
    calendar: Use the new "%OB" format in strftime()
    
    Closes #9
    
    See merge request GNOME/gtk!10

 gtk/gtkcalendar.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---