[SCM] mapcache branch, master, updated. upstream/1.2.0-87-g555f286

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 2c2113b4706edbe5702b6c1ee70bbd18704124ff
Merge: 5dd993938b21610811412f4b27ab89c0c130db43 0771daf41c345ea31ee8f1577601a21407e4dfea
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 18 00:58:52 2013 +0200

    Merge remote-tracking branch 'origin/master' into jessie
    
    Conflicts:
    	debian/patches/mapcache_seed_typo.patch


-- 
Packaging for MapCache