[SCM] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf

Tue Sep 17 22:46:15 UTC 2013

The following commit has been merged in the master branch:
commit d57e2dd19f17c88e39e70e40a441ce3824132017
Merge: 478a1f99cc6bf47e098b213c70c37a7e31b42117 b3e567f69c1dcef4c9d1b12211689df82d7d5d5f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 17 20:31:35 2013 +0200

    Merge upstream release 1.2.0 from branch 'upstream'
    
    Conflicts:
    	CMakeLists.txt
    	include/mapcache-config.h.in


-- 
Packaging for MapCache