[gnome-calendar: 2/2] Merge branch 'master' into 'master'

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit bbbabecc5843e0ec8b27c37b38d94fcec98d9977
Merge: 91beda2 7c2ca40
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Dec 5 23:13:44 2017 +0000

    Merge branch 'master' into 'master'
    
    Add <Ctrl>+f shortcut to activate search bar.
    
    See merge request GNOME/gnome-calendar!5

 src/gcal-window.c | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)
---