[SCM] mapserver branch, master, updated. upstream/6.2.1-111-gd8046e4

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit ca790578641c395e045a2b6696be7118e2537e25
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Aug 21 16:44:37 2013 +0200

    Update upstream bug info for typo patch.

diff --git a/debian/patches/shp2img-typo.patch b/debian/patches/shp2img-typo.patch
index 7cfa6a2..502d2a8 100644
--- a/debian/patches/shp2img-typo.patch
+++ b/debian/patches/shp2img-typo.patch
@@ -1,5 +1,7 @@
 Description: Fix typo in usage information.
 Author: Bas Couwenberg <sebastic at xs4all.nl>
+Bug: https://github.com/mapserver/mapserver/pull/4740
+Applied-Upstream: https://github.com/mapserver/mapserver/commit/cbc9683b3a3fd07059312583aaa10b267907e711
 Last-Update: 2013-06-14
 --- a/shp2img.c
 +++ b/shp2img.c

-- 
Packaging for MapServer