[SCM] mapcache branch, master, updated. upstream/1.2.0-107-gebc9794

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit d04e6ec68bf5deed73ad5b7f16d006c645ca5dec
Merge: 5787924f7da23e1f0df0a2f4257b3abd6416f81f de1f3bc8639f1955c870871d2e5d324123cc449a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 3 16:37:23 2014 +0100

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1


-- 
Packaging for MapCache