[gnome-contacts/wip/map-widget: 7/7] Merge branch 'fixup' into wip/map-widget src/contacts-app.vala

[Jonas Danielsson <jonasdn src gnome org>]

commit 9ec57f6dc6a66acd1f4e8f0b1ecd202491caa8df
Merge: b8fb545 2bc3aae
Author: Jonas Danielsson <jonas threetimestwo org>
Date:   Tue Dec 16 07:45:33 2014 -0500

    Merge branch 'fixup' into wip/map-widget
        src/contacts-app.vala

 configure.ac                    |    4 +-
 data/Makefile.am                |    1 +
 data/contacts.gresource.xml     |    1 +
 data/ui/contacts-address-map.ui |   37 +++++++
 data/ui/style.css               |    5 +
 src/Makefile.am                 |    1 +
 src/contacts-address-map.vala   |  206 +++++++++++++++++++++++++++++++++++++++
 src/contacts-app.vala           |    2 +-
 src/contacts-contact-sheet.vala |    7 ++
 src/contacts-contact.vala       |   34 +++++++
 10 files changed, 296 insertions(+), 2 deletions(-)
---