[libchamplain/libchamplain-0-12: 19/22] Merge the changes from master for release

[Jiří Techet <jiritechet src gnome org>]

commit 919b3a2cc0301ba261c687051de0312c94814bfa
Merge: 25f0038 cf985ac
Author: Jiří Techet <techet gmail com>
Date:   Mon Sep 16 22:50:22 2013 +0200

    Merge the changes from master for release
    
    Merge branch 'master' into libchamplain-0-12

 champlain/Makefile.am                     |    6 +-
 champlain/champlain-error-tile-renderer.c |    6 +-
 champlain/champlain-file-cache.c          |    4 +-
 champlain/champlain-image-renderer.c      |   88 ++++---
 champlain/champlain-license.c             |   19 ++
 champlain/champlain-map-source-factory.c  |  106 ++++++++-
 champlain/champlain-map-source-factory.h  |   32 +++
 champlain/champlain-view.c                |  393 +++++++++++++++++++++++------
 champlain/champlain-view.h                |    7 +
 demos/launcher-gtk.c                      |   62 +++++-
 docs/reference-gtk/Makefile.am            |    2 +-
 docs/reference/Makefile.am                |    2 +-
 docs/reference/libchamplain-sections.txt  |    9 +
 docs/reference/libchamplain.types         |    1 -
 14 files changed, 615 insertions(+), 122 deletions(-)
---